1. 06 Feb, 2007 39 commits
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 49c26cfd
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      sql/sql_analyse.cc:
        Auto merged
      vio/viosslfactories.c:
        Auto merged
      49c26cfd
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-maint · 6b7aee7b
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      6b7aee7b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · a9aa21c1
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      a9aa21c1
    • unknown's avatar
      Merge 192.168.0.10:mysql/yassL-import/my51-yassL-import · 65e8f44b
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      vio/viosslfactories.c:
        Auto merged
      extra/yassl/taocrypt/src/asn.cpp:
        Manual merge of yaSSL import and "fix warnings"
      65e8f44b
    • unknown's avatar
      Merge 192.168.0.10:mysql/yassL-import/my50-yassL-import · b5f67a63
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      vio/viosslfactories.c:
        Auto merged
      b5f67a63
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/yassL-import/my50-yassL-import · 5a4e074c
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/yassL-import/my51-yassL-import
      
      
      vio/viosslfactories.c:
        Auto merged
      5a4e074c
    • unknown's avatar
      Bug#24157 openssl_1 regression test is broken two different ways · c6968d49
      unknown authored
       - Send output from 'ERR_print_errors_fp' to DBUG_FILE if --debug is used
      
      
      vio/viosslfactories.c:
        Send output from 'ERR_print_errors_fp' to DBUG_FILE if --debug is used
      c6968d49
    • unknown's avatar
      Update result file for 5.1 · 146a76b0
      unknown authored
      146a76b0
    • unknown's avatar
      Fix merge error · 04e51556
      unknown authored
      04e51556
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · ca48df6e
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      ca48df6e
    • unknown's avatar
    • unknown's avatar
      Bug#25988 openssl_1 Test Case Fails · 118c50b7
      unknown authored
       - Small difference in output from 'X509_NAME_Oneline' between OpenSSL and yaSSL. OpenSSL uses
         an extension that allow's the email adress of the cert holder.   
       - Imported patch for yaSSL "add email to DN output"
      
      
      extra/yassl/taocrypt/src/asn.cpp:
        Import patch yassl.diff
      mysql-test/r/openssl_1.result:
        Update result file
      mysql-test/t/openssl_1.test:
        Update test to include "emailAddress=" tag in the required SUBJECT for grant.
      118c50b7
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · e6d84b8a
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/range.result:
        Auto merged
      mysql-test/t/range.test:
        Auto merged
      mysys/default.c:
        Auto merged
      scripts/mysqld_multi.sh:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      e6d84b8a
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 48f233c3
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/range.result:
        Auto merged
      mysql-test/t/range.test:
        Auto merged
      mysys/default.c:
        Auto merged
      scripts/mysqld_multi.sh:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Merfge backport
      48f233c3
    • unknown's avatar
      Merge 192.168.0.10:mysql/mysql-5.1-maint · 08145c06
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      BitKeeper/etc/collapsed:
        auto-union
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/range.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      scripts/mysqld_multi.sh:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      08145c06
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · dba4554f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysys/default.c:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      Makefile.am:
        SCCS merged
      dba4554f
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · 42942d4c
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      Makefile.am:
        Auto merged
      cmd-line-utils/readline/display.c:
        Auto merged
      configure.in:
        Auto merged
      extra/yassl/include/buffer.hpp:
        Auto merged
      extra/yassl/include/crypto_wrapper.hpp:
        Auto merged
      extra/yassl/include/yassl_imp.hpp:
        Auto merged
      extra/yassl/include/yassl_int.hpp:
        Auto merged
      extra/yassl/src/crypto_wrapper.cpp:
        Auto merged
      extra/yassl/taocrypt/include/algebra.hpp:
        Auto merged
      extra/yassl/taocrypt/include/des.hpp:
        Auto merged
      extra/yassl/taocrypt/include/hash.hpp:
        Auto merged
      extra/yassl/taocrypt/include/hmac.hpp:
        Auto merged
      extra/yassl/taocrypt/include/modarith.hpp:
        Auto merged
      extra/yassl/taocrypt/include/modes.hpp:
        Auto merged
      extra/yassl/taocrypt/include/rsa.hpp:
        Auto merged
      extra/yassl/taocrypt/include/type_traits.hpp:
        Auto merged
      extra/yassl/taocrypt/mySTL/list.hpp:
        Auto merged
      extra/yassl/taocrypt/src/aes.cpp:
        Auto merged
      extra/yassl/taocrypt/src/algebra.cpp:
        Auto merged
      extra/yassl/taocrypt/src/asn.cpp:
        Auto merged
      extra/yassl/testsuite/testsuite.cpp:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysys/default.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      extra/yassl/taocrypt/test/test.cpp:
        Manual merge
      mysql-test/r/grant.result:
        Manual merge
      mysql-test/r/select.result:
        Manual merge
      mysql-test/t/grant.test:
        Manual merge
      mysql-test/t/select.test:
        Manual merge
      sql/field.h:
        Manual merge
      sql/mysqld.cc:
        Manual merge
      42942d4c
    • unknown's avatar
      Fix windows build · 9c4ea7aa
      unknown authored
      9c4ea7aa
    • unknown's avatar
      Merge 192.168.0.10:mysql/mysql-5.0-maint · 92285ad7
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      92285ad7
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · f236ccef
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      Makefile.am:
        Auto merged
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysys/default.c:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/select.result:
        Manual merge
      mysql-test/t/select.test:
        Manual merge
      f236ccef
    • unknown's avatar
      Merge 192.168.0.10:mysql/mysql-4.1-maint · e34793eb
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
      
      
      mysys/default.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      e34793eb
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/my41-nmj · 260571d4
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      sql/sql_prepare.cc:
        Auto merged
      260571d4
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 9ba9379f
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      BitKeeper/etc/collapsed:
        auto-union
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/range.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      scripts/mysqld_multi.sh:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      9ba9379f
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 · ce054bd0
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      ce054bd0
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · d1531de7
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
      
      d1531de7
    • unknown's avatar
      Merge 192.168.0.10:mysql/mysql-4.1-maint · f4363d92
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
      
      
      sql/sql_prepare.cc:
        Auto merged
      f4363d92
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 · 117c8b23
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/bug24805/my51-bug24805
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/disabled.def:
        Manual merge
      117c8b23
    • unknown's avatar
      Bug#24805 mtr.pl can't handle test with --disable-log-bin · be60eb34
      unknown authored
      - Don't give mysqld the --log-bin argument if .opt file
        contains --skip-log-bin
      - Enable flush2 test
      
      
      mysql-test/mysql-test-run.pl:
        Don't give mysqld the --log-bin argument if .opt file contains --skip-log-bin 
        Don't pass mysqld --binlog-format=s if --skip-log-bin
      mysql-test/t/disabled.def:
        Enable flush2
      mysql-test/t/flush2-master.opt:
        Use --skip-log-bin in flush2 to test flush without bin logging
      be60eb34
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 12667093
      unknown authored
      into  mysql.com:/home/ram/work/b23782/b23782.5.0
      
      
      sql/sql_analyse.cc:
        Auto merged
      12667093
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c29734bc
      unknown authored
      into  mysql.com:/home/ram/work/b23782/b23782.5.1
      
      c29734bc
    • unknown's avatar
      Bug#8983 one place that isn't strict-aliasing-safe · 3724ceac
      unknown authored
       - Backport fix from 5.0
      
      
      sql/sql_prepare.cc:
        Avoid problems with -no-strict-aliasing in gcc 4.0+
      3724ceac
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 82b5380f
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug23938/my51-bug23938
      
      
      sql/item_timefunc.cc:
        Auto merged
      82b5380f
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 036634df
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
      
      
      BitKeeper/etc/collapsed:
        auto-union
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/range.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      scripts/mysqld_multi.sh:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      036634df
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b23782/b23782.5.0 · 364584be
      unknown authored
      into  mysql.com:/home/ram/work/b23782/b23782.5.1
      
      
      sql/sql_analyse.cc:
        Auto merged
      364584be
    • unknown's avatar
      Fix for bug #23782: Stored procedures: crash if variable in procedure · ca01afff
      unknown authored
      analyse
      
      We have to call fix_fields() for procedure analyse' arguments as they may   
      not be
      fixed in some circumstances.
      
      (as the crash appears when mysqld starts skipping binlog, a test case
      will be added when we can --skip-bin-log in -master.opt)
      
      
      sql/sql_analyse.cc:
        Fix for bug #23782: Stored procedures: crash if variable in procedure
        analyse
          - call fix_fields() if arguments are not fixed.
      ca01afff
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 1b86a68f
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug23938/my41-bug23938
      
      
      sql/item_timefunc.cc:
        Auto merged
      1b86a68f
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · b411edae
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
      
      
      sql/item_timefunc.cc:
        Auto merged
      b411edae
    • unknown's avatar
      Merge mysql.com:/usr/home/ram/work/bug23938/my50-bug23938 · 0df7fb0e
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug23938/my51-bug23938
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      0df7fb0e
    • unknown's avatar
      Merge mysql.com:/usr/home/ram/work/bug23938/my41-bug23938 · aa4bea2e
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
      
      
      sql/item_timefunc.cc:
        Auto merged
      mysql-test/r/cast.result:
        SCCS merged
      mysql-test/t/cast.test:
        SCCS merged
      aa4bea2e
  2. 05 Feb, 2007 1 commit
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · ddd9e295
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      BUILD/SETUP.sh:
        Auto merged
      Makefile.am:
        Auto merged
      client/mysql.cc:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysys/default.c:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      storage/myisammrg/ha_myisammrg.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Manually merged.
      ddd9e295