1. 13 Feb, 2006 1 commit
  2. 08 Feb, 2006 2 commits
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5dc66afa
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
      
      
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        Auto merged
      5dc66afa
    • unknown's avatar
      NdbEventOperationImpl.cpp, NdbEventOperation.cpp, NdbEventOperation.hpp: · af59ba3b
      unknown authored
        Put back getTable
      NdbDictionaryImpl.cpp, NdbDictionary.cpp, NdbDictionary.hpp:
        Added putTable
      
      
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Added putTable
      storage/ndb/include/ndbapi/NdbEventOperation.hpp:
        Put back getTable
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        Added putTable
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Added putTable
      storage/ndb/src/ndbapi/NdbEventOperation.cpp:
        Put back getTable
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        Put back getTable
      af59ba3b
  3. 07 Feb, 2006 24 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/tmp_merge · f43fa49b
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/extra/rpl_tests/rpl_stm_000001.test:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/rpl_loaddata.result:
        Auto merged
      mysql-test/r/rpl_loaddata_m.result:
        Auto merged
      mysql-test/r/rpl_loaddata_s.result:
        Auto merged
      mysql-test/r/rpl_misc_functions.result:
        Auto merged
      mysql-test/r/rpl_replicate_do.result:
        Auto merged
      mysql-test/r/rpl_stm_000001.result:
        Auto merged
      mysql-test/r/sp-security.result:
        Auto merged
      mysql-test/r/trigger-compat.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      mysql-test/t/rpl_loaddata_m.test:
        Auto merged
      mysql-test/t/rpl_loaddata_s.test:
        Auto merged
      mysql-test/t/rpl_misc_functions.test:
        Auto merged
      mysql-test/t/rpl_replicate_do.test:
        Auto merged
      mysql-test/t/sp-security.test:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      mysql-test/t/trigger-compat.test:
        Auto merged
      mysql-test/t/trigger-grant.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      mysql-test/t/type_varchar.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql-common/client.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      f43fa49b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1f84fadf
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
      
      1f84fadf
    • unknown's avatar
      Removed extra "drop view v1" · 4d20ff9c
      unknown authored
      
      mysql-test/r/sp-prelocking.result:
        Update test result
      mysql-test/t/sp-prelocking.test:
        One drop too many
      4d20ff9c
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 49f416d5
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      49f416d5
    • unknown's avatar
      Update after merge 5.0 -> 5.1 · 69d1ef9f
      unknown authored
      
      mysql-test/r/rpl_failed_optimize.result:
        Updates test result
      mysql-test/r/rpl_insert_id.result:
        Updates test result
      mysql-test/r/rpl_loaddata.result:
        Updates test result
      mysql-test/r/rpl_loaddata_s.result:
        Updates test result
      mysql-test/r/rpl_multi_update3.result:
        Updates test result
      69d1ef9f
    • unknown's avatar
      Bug #17188 CRBR: ignores --binlog_ignore_db= settings · 097cee5f
      unknown authored
      
      mysql-test/r/ndb_binlog_ignore_db.result:
        New BitKeeper file ``mysql-test/r/ndb_binlog_ignore_db.result''
      mysql-test/t/ndb_binlog_ignore_db-master.opt:
        New BitKeeper file ``mysql-test/t/ndb_binlog_ignore_db-master.opt''
      mysql-test/t/ndb_binlog_ignore_db.test:
        New BitKeeper file ``mysql-test/t/ndb_binlog_ignore_db.test''
      097cee5f
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result · ec647b7f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/type_float.result:
        Auto merged
      mysql-test/t/type_float.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      ec647b7f
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug15302/my51-bug15302 · ccd5fb28
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
      
      
      client/mysqltest.c:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      ccd5fb28
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var · dbfaa760
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
      
      
      mysql-test/extra/rpl_tests/rpl_stm_000001.test:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/rpl_loaddata.result:
        Auto merged
      mysql-test/r/rpl_loaddata_m.result:
        Auto merged
      mysql-test/r/rpl_loaddata_s.result:
        Auto merged
      mysql-test/r/rpl_misc_functions.result:
        Auto merged
      mysql-test/r/rpl_replicate_do.result:
        Auto merged
      mysql-test/r/rpl_stm_000001.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      mysql-test/t/rpl_loaddata_m.test:
        Auto merged
      mysql-test/t/rpl_loaddata_s.test:
        Auto merged
      mysql-test/t/rpl_misc_functions.test:
        Auto merged
      mysql-test/t/rpl_replicate_do.test:
        Auto merged
      mysql-test/t/trigger-compat.test:
        Auto merged
      mysql-test/t/type_varchar.test:
        Auto merged
      mysql-test/r/mysqltest.result:
        Merge 5.0 -> 5.1
      mysql-test/t/trigger-grant.test:
        "Use local" when merging 5.0 -> 5.1
      dbfaa760
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var · 197e2f5e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
      
      
      mysql-test/t/mysqltest.test:
        Auto merged
      197e2f5e
    • unknown's avatar
      Merge... · 68575c0a
      unknown authored
      Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/rpl_loaddata_m.result:
        Auto merged
      mysql-test/r/sp-security.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/read_only.test:
        Auto merged
      mysql-test/t/sp-security.test:
        Auto merged
      mysql-test/t/trigger-compat.test:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      mysql-test/r/trigger-compat.result:
        Merge 5.0 -> 5.1
      68575c0a
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 189e0359
      unknown authored
      into  big_geek.:C:/Work/mysql/mysql-5.1
      
      189e0359
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f4b90c29
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      f4b90c29
    • unknown's avatar
      Merge... · 6d4946fc
      unknown authored
      Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
      into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/extra/binlog_tests/ctype_cp932.test:
        Auto merged
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
        Auto merged
      mysql-test/extra/rpl_tests/rpl_stm_000001.test:
        Auto merged
      mysql-test/r/binlog_stm_ctype_cp932.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/rpl000017.result:
        Auto merged
      mysql-test/r/rpl_loaddata.result:
        Auto merged
      mysql-test/r/rpl_loaddata_s.result:
        Auto merged
      mysql-test/r/rpl_replicate_do.result:
        Auto merged
      mysql-test/r/rpl_stm_000001.result:
        Auto merged
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Auto merged
      mysql-test/r/sp-prelocking.result:
        Auto merged
      mysql-test/r/type_bit.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/create_select_tmp.test:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/rpl000017.test:
        Auto merged
      mysql-test/t/rpl_replicate_do.test:
        Auto merged
      mysql-test/t/sp-prelocking.test:
        Auto merged
      mysql-test/t/trigger-compat.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      mysql-test/r/rpl_loaddata_m.result:
        Merge 5.0->5.1
      mysql-test/t/rpl_failed_optimize.test:
        Merge 5.0->5.1
      mysql-test/t/rpl_insert_id.test:
        Merge 5.0->5.1
      mysql-test/t/rpl_loaddata.test:
        Merge 5.0->5.1
      mysql-test/t/rpl_loaddata_m.test:
        Merge 5.0->5.1
      mysql-test/t/rpl_loaddata_s.test:
        Merge 5.0->5.1
      mysql-test/t/rpl_multi_update3.test:
        Merge 5.0->5.1
      6d4946fc
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 09fc76c2
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      09fc76c2
    • unknown's avatar
      cmake corrections to fix compiling on visual 7.1 · 5dcc958c
      unknown authored
      5dcc958c
    • unknown's avatar
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/tmp_merge · e4518ee3
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      mysql-test/r/information_schema_db.result:
        Auto merged
      sql/ha_archive.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/table.h:
        Auto merged
      mysql-test/r/information_schema.result:
        SCCS merged
      e4518ee3
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 742671f7
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      742671f7
    • unknown's avatar
      6c6cf23d
    • unknown's avatar
      Bug#17081 LOAD DATA INFILE" may not load all the data · fcdb1c26
      unknown authored
      Bug #17154  	load data infile hangs when duplicate key encountered
      
      
      mysql-test/r/ndb_load.result:
        New BitKeeper file ``mysql-test/r/ndb_load.result''
      mysql-test/t/ndb_load.test:
        New BitKeeper file ``mysql-test/t/ndb_load.test''
      fcdb1c26
    • unknown's avatar
      bug#16924 - ndb - insert wo/ specifying null on varsize attribute · cccea376
      unknown authored
        init both pos and len
      
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        init both pos and len
      cccea376
    • unknown's avatar
    • unknown's avatar
      MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event · da4f660e
      unknown authored
      
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        ndb, added additional getters on NdbDictionary::Event
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        ndb, added additional getters on NdbDictionary::Event
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        ndb, added additional getters on NdbDictionary::Event
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        ndb, added additional getters on NdbDictionary::Event
      da4f660e
  4. 06 Feb, 2006 13 commits