1. 11 Jul, 2006 5 commits
  2. 10 Jul, 2006 19 commits
  3. 09 Jul, 2006 1 commit
  4. 08 Jul, 2006 3 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · cad24c09
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
      
      
      myisam/mi_create.c:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      mysql-test/r/federated.result:
        Manual merge.
      mysql-test/t/federated.test:
        Manual merge.
      cad24c09
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0--main · e6f010b6
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-amerge
      
      
      e6f010b6
    • unknown's avatar
      A post-merge fix. · e1f3149c
      unknown authored
      e1f3149c
  5. 07 Jul, 2006 5 commits
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/tmp_merge · 60b7f9d6
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
      
      
      BitKeeper/etc/ignore:
        auto-union
      libmysqld/Makefile.am:
        Auto merged
      myisam/mi_create.c:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      mysql-test/r/myisam.result:
        Manual merge.
      mysql-test/t/myisam.test:
        Manual merge.
      sql/set_var.cc:
        Manual merge.
      sql/set_var.h:
        Manual merge.
      sql/sql_cache.cc:
        Manual merge.
      sql/sql_class.cc:
        Manual merge.
      60b7f9d6
    • unknown's avatar
      Cleanups: ignore more files. · e9775dd8
      unknown authored
      
      BitKeeper/etc/ignore:
        Modify ignore list to work with BitKeeper 4
      mysql-test/t/mysqldump.test:
        Fix the test for Bug#18462 to use MYSQLTEST_VARDIR instead of mysql-test/
        directory for temporary files.
      e9775dd8
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-root · f5340f8c
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/sql_update.cc:
        Manual merge.
      f5340f8c
    • unknown's avatar
      Merge mysql.com:/space_old/pekka/ndb/version/my41-bug20847 · 8de29d3a
      unknown authored
      into  mysql.com:/space_old/pekka/ndb/version/my50-bug20847
      
      
      BitKeeper/etc/config:
        auto
      ndb/src/kernel/blocks/ERROR_codes.txt:
        manual
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        SCCS merged
      ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        SCCS merged
      ndb/test/ndbapi/testDict.cpp:
        SCCS merged
      ndb/test/run-test/daily-basic-tests.txt:
        SCCS merged
      sql/opt_range.cc:
        SCCS merged
      8de29d3a
    • unknown's avatar
      ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies · 2c48aaa1
      unknown authored
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        DbtupTabDesMan: add merge with left buddies
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        DbtupTabDesMan: add merge with left buddies
      ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        DbtupTabDesMan: add merge with left buddies
      ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
        DbtupTabDesMan: add merge with left buddies
      ndb/test/ndbapi/testDict.cpp:
        DbtupTabDesMan: add merge with left buddies
      ndb/test/run-test/daily-basic-tests.txt:
        DbtupTabDesMan: add merge with left buddies
      2c48aaa1
  6. 06 Jul, 2006 7 commits