1. 22 Mar, 2007 15 commits
  2. 21 Mar, 2007 25 commits
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · b203723b
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
      
      
      b203723b
    • unknown's avatar
      Update the result file with an updated comment. · 8ed9a540
      unknown authored
      8ed9a540
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · c4311efa
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      c4311efa
    • unknown's avatar
      Try to fix events_logs_tests race on Windows. · 20fd65ff
      unknown authored
      
      mysql-test/t/events_logs_tests.test:
        Try to fix a race condition that breaks this test on Windows.
      20fd65ff
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 817442e8
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      817442e8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 54a0f623
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      54a0f623
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · e772a22d
      unknown authored
      into  recycle.(none):/src/bug27144/my50-bug27144
      
      
      e772a22d
    • unknown's avatar
      Merge recycle.(none):/src/bug27144/my50-bug27144 · 9e6d54e4
      unknown authored
      into  recycle.(none):/src/bug27144/my51-bug27144
      
      
      mysql-test/t/sp-destruct.test:
        SCCS merged
      9e6d54e4
    • unknown's avatar
      Bug#27144 sp-destruct.test is disabled on Windows · 65c34cc8
      unknown authored
      - Update test to run properly on Windows.
      
      
      mysql-test/t/sp-destruct.test:
        Bug#27144 sp-destruct.test is disabled on Windows
        - Enabled test on Windows.
        - Replaced non-portable system commands (mkdir, rmdir, mv, cp, echo) 
        with the mysqltest builtin commands.
        - Replace Windows directory seperator in error ER_NOT_FROM_FILE with
        posix directory seperator for single test/result pair.
      65c34cc8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 4390f788
      unknown authored
      into  recycle.(none):/src/bug23736/my50-bug23736
      
      
      4390f788
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 26088046
      unknown authored
      into  recycle.(none):/src/bug23736/my51-bug23736
      
      
      26088046
    • unknown's avatar
      Fix warnings on Windows. · 858ff638
      unknown authored
      
      sql/event_data_objects.cc:
        Fix Windows 64 bit build warnings. No better fix exists at the moment.
      858ff638
    • unknown's avatar
      Fix a broken merge. · 33a51fd8
      unknown authored
      
      scripts/mysql_system_tables.sql:
        Add time_zone to the list of mysql.event columns.
      scripts/mysql_system_tables_fix.sql:
        Update after a bad merge: now mysql_system_tables_fix contains
        only alter definitions, no CREATE definitions (single definition
        source approach that was implemented by Magnus).
      33a51fd8
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · a1368c8e
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      a1368c8e
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 2d3b2458
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      2d3b2458
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · b278b210
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
      
      
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      b278b210
    • unknown's avatar
      ndb - bug#27283 · f5acedb6
      unknown authored
          Additional fix for 2-node case
      
      
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Add error insert ref for errcode = 7181
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
      f5acedb6
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · d344d81c
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
        Auto merged
      BitKeeper/deleted/.del-test_db.sql:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.h:
        Auto merged
      mysql-test/install_test_db.sh:
        Manual merge
      mysql-test/mysql-test-run.pl:
        Manual merge
      netware/Makefile.am:
        Manual merge
      d344d81c
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 2176fef4
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
        Auto merged
      BitKeeper/deleted/.del-test_db.sql:
        Auto merged
      mysql-test/install_test_db.sh:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.h:
        Auto merged
      netware/Makefile.am:
        Manual merge
      2176fef4
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new-maint · ed0badb1
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
        Auto merged
      BitKeeper/deleted/.del-test_db.sql:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.h:
        Auto merged
      mysql-test/install_test_db.sh:
        Manual merge
      mysql-test/r/flush2.result:
        Manual merge
      netware/Makefile.am:
        Manual merge
      ed0badb1
    • unknown's avatar
      Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-build · 94a40d6c
      unknown authored
      into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
      
      
      94a40d6c
    • unknown's avatar
      Merge... · 6fb9ef87
      unknown authored
      Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug26079_binlog_max_innodb
      into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
      
      
      sql/log.cc:
        Auto merged
      6fb9ef87
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · f58baa6a
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      f58baa6a
    • unknown's avatar
      mysqlbinlog-cp932.test: · f397b422
      unknown authored
        merging
      
      
      mysql-test/t/mysqlbinlog-cp932.test:
        merging
      f397b422
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 01fe2589
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      01fe2589