1. 13 Jun, 2007 24 commits
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 253f994a
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      253f994a
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · f442dd9a
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      configure.in:
        Auto merged
      f442dd9a
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 659387db
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      scripts/make_win_bin_dist:
        Auto merged
      659387db
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 6adb9d8f
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      netware/comp_err.def:
        Auto merged
      netware/isamchk.def:
        Auto merged
      netware/isamlog.def:
        Auto merged
      netware/libmysql.def:
        Auto merged
      netware/my_print_defaults.def:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysql_test_run.def:
        Auto merged
      netware/mysql_waitpid.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      netware/mysqltest.def:
        Auto merged
      netware/pack_isam.def:
        Auto merged
      netware/perror.def:
        Auto merged
      netware/replace.def:
        Auto merged
      netware/resolve_stack_dump.def:
        Auto merged
      netware/resolveip.def:
        Auto merged
      sql/Makefile.am:
        Auto merged
      6adb9d8f
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 09330a18
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      09330a18
    • unknown's avatar
      Merge trift2.:/MySQL/M50/merge-5.0 · 9411bffb
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      configure.in:
        Auto merged
      netware/comp_err.def:
        Auto merged
      netware/isamchk.def:
        Auto merged
      netware/isamlog.def:
        Auto merged
      netware/libmysql.def:
        Auto merged
      netware/my_print_defaults.def:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysql_test_run.def:
        Auto merged
      netware/mysql_waitpid.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      netware/mysqltest.def:
        Auto merged
      netware/pack_isam.def:
        Auto merged
      netware/perror.def:
        Auto merged
      netware/replace.def:
        Auto merged
      netware/resolve_stack_dump.def:
        Auto merged
      netware/resolveip.def:
        Auto merged
      sql/Makefile.am:
        Keep the existing version, the only difference is formatting.
      9411bffb
    • unknown's avatar
      Merge trift2.:/MySQL/M51/merge-5.1 · b9416f20
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      netware/comp_err.def:
        Auto merged
      netware/isamchk.def:
        Auto merged
      netware/isamlog.def:
        Auto merged
      netware/libmysql.def:
        Auto merged
      netware/my_print_defaults.def:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysql_test_run.def:
        Auto merged
      netware/mysql_waitpid.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      netware/mysqltest.def:
        Auto merged
      netware/pack_isam.def:
        Auto merged
      netware/perror.def:
        Auto merged
      netware/replace.def:
        Auto merged
      netware/resolve_stack_dump.def:
        Auto merged
      netware/resolveip.def:
        Auto merged
      sql/Makefile.am:
        Keep the existing version, the only difference is formatting.
      b9416f20
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 541c5c6e
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      scripts/make_win_bin_dist:
        To be done separate, later.
      541c5c6e
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 2cc25fd6
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      scripts/make_win_bin_dist:
        null merge
      2cc25fd6
    • unknown's avatar
      Merge trift2.:/MySQL/M50/merge-5.0 · 4c2fe0df
      unknown authored
      into  trift2.:/MySQL/M51/merge-5.1
      
      
      configure.in:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      sql/Makefile.am:
        Auto merged
      libmysqld/lib_sql.cc:
        "real_id" is not needed in 5.1, so the change need not propagate.
      sql/item_func.cc:
        "real_id" is not needed in 5.1, so the change need not propagate.
      4c2fe0df
    • unknown's avatar
      Merge trift2.:/MySQL/M41/tmp-4.1 · 8d836281
      unknown authored
      into  trift2.:/MySQL/M50/merge-5.0
      
      
      configure.in:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      netware/comp_err.def:
        Auto merged
      netware/isamchk.def:
        Auto merged
      netware/isamlog.def:
        Auto merged
      netware/libmysql.def:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysql_test_run.def:
        Auto merged
      netware/mysql_waitpid.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      netware/mysqltest.def:
        Auto merged
      netware/pack_isam.def:
        Auto merged
      netware/perror.def:
        Auto merged
      netware/replace.def:
        Auto merged
      netware/resolve_stack_dump.def:
        Auto merged
      netware/resolveip.def:
        Auto merged
      sql/item_func.cc:
        Auto merged
      netware/my_print_defaults.def:
        5.0 already has 128 kB stack size.
      sql/Makefile.am:
        Manual merge.
      8d836281
    • unknown's avatar
      Merge trift2.:/MySQL/M41/tmp-4.1 · 672948f0
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      672948f0
    • unknown's avatar
      sql/item_func.cc · 9cbd0ae4
      unknown authored
          Improved check for thread identity in the "embedded" case,
          provided by Monty.
          
          This finishes the fixes for bug#27078.
      
      
      sql/item_func.cc:
        Improved check for thread identity in the "embedded" case,
        provided by Monty.
        
        This finishes the fixes for bug#27078.
      9cbd0ae4
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit · dabb72aa
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      dabb72aa
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 · a9d39c16
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      a9d39c16
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · a2eb4b1f
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      a2eb4b1f
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 69ff5fff
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
      
      
      69ff5fff
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · e63306a8
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
      
      
      configure.in:
        Auto merged
      e63306a8
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 · a6b7ab6b
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
      
      
      configure.in:
        null-merge version number change
      a6b7ab6b
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit · 443e2819
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
      
      
      443e2819
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit · 3173e8ae
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit
      
      
      BitKeeper/triggers/post-commit:
        SCCS merged
      3173e8ae
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit · 43e77e61
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
      
      
      BitKeeper/triggers/post-commit:
        Remove dev-public@ / dev-bugs@ e-mail, is now handled differently. Merge fix for 5.0.
      43e77e61
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit · d87c9875
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
      
      
      d87c9875
    • unknown's avatar
      BK changes for · ff265ac8
      unknown authored
      https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally
      
      
      BitKeeper/triggers/post-commit:
        1) Add additional method of detecting merge changesets.
        2) Remove code sending e-mail to dev-public@ or dev-bugs@.
        3) Change code sending e-mail to commits@ to send to dev-private@ if a specific file is present in the BK root directory, denoting this tree as private.
      ff265ac8
  2. 12 Jun, 2007 1 commit
    • unknown's avatar
      make_win_bin_dist: · 06b6749e
      unknown authored
        Aligned headers to include with Unix 'make install'
      
      
      scripts/make_win_bin_dist:
        Aligned headers to include with Unix 'make install'
      06b6749e
  3. 11 Jun, 2007 2 commits
  4. 08 Jun, 2007 1 commit
  5. 07 Jun, 2007 5 commits
    • unknown's avatar
      Do not use the "thd" pointer to identify a thread in the embedded lib, · db5aab1d
      unknown authored
      but rather use the "thread_id" counter.
      
      Fixes bug#27078:
      Compile error: lib_sql.cc cast from 'THD*' to 'pthread_t' loses precision
      
      
      libmysqld/lib_sql.cc:
        Avoid casting a pointer to a (possibly) int, which will not compile on some platforms:
        Do not use the "thd" pointer to identify a thread in the embedded lib,
        but rather use the "thread_id" counter.
        
        Patch is proposed by Monty.  Fixes bug#27078.
      db5aab1d
    • unknown's avatar
      Merge trift2.:/MySQL/M41/bug23504-4.1 · 35a948f7
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      35a948f7
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 73016f8f
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      BitKeeper/deleted/.del-CMakeLists.txt~1:
        Auto merged
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      73016f8f
    • unknown's avatar
      Merge trift2.:/MySQL/M41/bug23504-4.1 · d37e1642
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      netware/comp_err.def:
        Auto merged
      netware/isamchk.def:
        Auto merged
      netware/isamlog.def:
        Auto merged
      netware/libmysql.def:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysql_test_run.def:
        Auto merged
      netware/mysql_waitpid.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      netware/mysqltest.def:
        Auto merged
      netware/pack_isam.def:
        Auto merged
      netware/perror.def:
        Auto merged
      netware/replace.def:
        Auto merged
      netware/resolve_stack_dump.def:
        Auto merged
      netware/resolveip.def:
        Auto merged
      netware/my_print_defaults.def:
        Use 5.0 version
      d37e1642
    • unknown's avatar
      netware/*.def : Allocate 128K stack for all executables (bug#23504) · bc671e2f
      unknown authored
      
      netware/comp_err.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/isamchk.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/isamlog.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/libmysql.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/my_print_defaults.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisam_ftdump.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisamchk.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisamlog.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisampack.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_install_db.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_test_run.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_waitpid.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqladmin.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlbinlog.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlcheck.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqld.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqld_safe.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqldump.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlimport.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlshow.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqltest.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/pack_isam.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/perror.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/replace.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/resolve_stack_dump.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/resolveip.def:
        Allocate 128K stack for all executables (bug#23504)
      bc671e2f
  6. 06 Jun, 2007 7 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M41/mysql-4.1 · 1811c893
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      1811c893
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · cdf0327e
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      CMakeLists.txt:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/ctype_cp932_binlog.test:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      cdf0327e
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 92a46e05
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      BitKeeper/deleted/.del-CMakeLists.txt~1:
        Auto merged
      CMakeLists.txt:
        Auto merged
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      92a46e05
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · cb17b801
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
      
      
      cb17b801
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · d05a9580
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      d05a9580
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 035b5005
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
      
      
      storage/ndb/src/kernel/vm/Configuration.cpp:
        Auto merged
      035b5005
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-build · 6b81af5f
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      storage/ndb/src/common/transporter/Packer.cpp:
        Auto merged
      storage/ndb/src/common/transporter/TCP_Transporter.hpp:
        Auto merged
      storage/ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testNdbApi.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        SCCS merged
      6b81af5f