1. 06 Feb, 2007 2 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · 8c6fe358
      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
      8c6fe358
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · aff6c2e7
      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
      aff6c2e7
  2. 05 Feb, 2007 5 commits
  3. 04 Feb, 2007 2 commits
  4. 03 Feb, 2007 3 commits
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 34414314
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      mysql-test/Makefile.am:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      storage/csv/ha_tina.h:
        Auto merged
      34414314
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 9e01ae9f
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      BUILD/SETUP.sh:
        Auto merged
      configure.in:
        Auto merged
      BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
        Auto merged
      BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
        Auto merged
      BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
        Auto merged
      BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
        Auto merged
      BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
        Auto merged
      client/mysql.cc:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      sql/gen_lex_hash.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Manual merged
      support-files/mysql.spec.sh:
        Manual merged
      9e01ae9f
    • unknown's avatar
      After merge fix · d3c1511a
      unknown authored
      d3c1511a
  5. 02 Feb, 2007 15 commits
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · 3f3d9093
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
      
      
      BUILD/SETUP.sh:
        Auto merged
      client/mysql.cc:
        Auto merged
      configure.in:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/archive/ha_archive.cc:
        Auto merged
      plugin/daemon_example/daemon_example.cc:
        Merged with main 5.1
      sql/mysqld.cc:
        Merged with main 5.1
      3f3d9093
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 8a9c521b
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      sql/handler.cc:
        Auto merged
      sql/examples/ha_tina.cc:
        Auto merged
      sql/examples/ha_tina.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      mysql-test/Makefile.am:
        Manual merged
      8a9c521b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3c0aca02
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      sql/item_func.cc:
        Auto merged
      3c0aca02
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0dc19dad
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      
      0dc19dad
    • unknown's avatar
      After merge fix · 98b9ac69
      unknown authored
      98b9ac69
    • unknown's avatar
      After merge fix · 4df381fd
      unknown authored
      4df381fd
    • unknown's avatar
      04cbadde
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 13390deb
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      sql/item_func.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      13390deb
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 9bb750f5
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      9bb750f5
    • unknown's avatar
      Valgrind errors · 84445bbb
      unknown authored
      added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)
      
      
      84445bbb
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 141080fa
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      include/my_pthread.h:
        Auto merged
      include/thr_alarm.h:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      141080fa
    • unknown's avatar
      after merge fix · c01bbd33
      unknown authored
      
      mysql-test/r/ndb_read_multi_range.result:
        result fix
      mysql-test/t/ndb_read_multi_range.test:
        test case fix
      c01bbd33
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-axmrg · d03d2987
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      include/my_pthread.h:
        Auto merged
      include/thr_alarm.h:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      d03d2987
    • unknown's avatar
      After merge fix · 5305cd7c
      unknown authored
      5305cd7c
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · ed0e4a96
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      mysql-test/r/distinct.result:
        Auto merged
      mysql-test/r/join_nested.result:
        Auto merged
      mysql-test/r/null_key.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/subselect3.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/func_time.result:
        manual merge
      mysql-test/r/information_schema.result:
        manual merge
      mysql-test/t/func_time.test:
        manual merge
      mysql-test/t/information_schema.test:
        manual merge
      sql/opt_range.cc:
        manual merge
      sql/sql_delete.cc:
        manual merge
      sql/sql_lex.h:
        manual merge
      ed0e4a96
  6. 01 Feb, 2007 13 commits
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · baddc8bd
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      client/mysql.cc:
        Auto merged
      include/my_global.h:
        Auto merged
      include/thr_alarm.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      mysys/thr_alarm.c:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/gen_lex_hash.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      vio/viosslfactories.c:
        Auto merged
      BitKeeper/deleted/.del-mysqld.cc.rej:
        Delete: sql/mysqld.cc.rej
      BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
        Auto merged
      BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
        Auto merged
      BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
        Auto merged
      BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
        Null merged
      BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
        Null merged
      BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
        Auto merged
      BUILD/SETUP.sh:
        Manual merged
      Makefile.am:
        Manual merged
      configure.in:
        Manual merged
      include/my_pthread.h:
        Manual merged
      mysql-test/Makefile.am:
        Manual merged
      sql/mysqld.cc:
        Manual merged
      support-files/mysql.spec.sh:
        Manual merged
      baddc8bd
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-axmrg · cd4670a7
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      BitKeeper/deleted/.del-valgrind.supp:
        Delete: mysql-test/valgrind.supp
      mysql-test/r/ps.result:
        SCCS merged
      mysql-test/r/symlink.result:
        Null merged
      mysql-test/t/ps.test:
        SCCS merged
      mysql-test/t/symlink.test:
        Null merged
      sql/field_conv.cc:
        Null merged
      sql/mysqld.cc:
        Null merged
      vio/viosslfactories.c:
        Null merged
      cd4670a7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · da984b33
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      BUILD/SETUP.sh:
        Auto merged
      configure.in:
        Auto merged
      da984b33
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · a4f74b86
      unknown authored
      into  mysql.com:/home/ram/work/b26012/b26012.5.0
      
      
      sql/field.h:
        Auto merged
      a4f74b86
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 6f5dd4b2
      unknown authored
      into  mysql.com:/home/ram/work/b26012/b26012.5.1
      
      
      6f5dd4b2
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b26012/b26012.5.0 · 3ca99c4f
      unknown authored
      into  mysql.com:/home/ram/work/b26012/b26012.5.1
      
      
      sql/field.h:
        Auto merged
      3ca99c4f
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b26012/b26012.4.1 · b591da53
      unknown authored
      into  mysql.com:/home/ram/work/b26012/b26012.5.0
      
      
      sql/field.h:
        Auto merged
      b591da53
    • unknown's avatar
      Fix for bug #26012: missed Field_double::size_of() · 4e1772e9
      unknown authored
      As we have Field_double::not_fixed we must have Field_double::size_of().
      
      
      sql/field.h:
        Fix for bug #26012: missed Field_double::size_of()
          - Field_double::size_of() added.
      4e1772e9
    • unknown's avatar
      Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail · a3083046
      unknown authored
      additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter
      
      
      mysql-test/r/information_schema.result:
        test result
      mysql-test/t/information_schema.test:
        test case
      sql/sql_show.cc:
        additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter
      a3083046
    • unknown's avatar
      Bug#25844: "make test" does not find mysql-test-run.pl · 8c2c5271
      unknown authored
      Need to change directory before calling mysql-test-run.pl
      
      
      8c2c5271
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · f20a72e1
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      f20a72e1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5698114c
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      5698114c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · a94401ba
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
      
      
      a94401ba