1. 19 Sep, 2006 1 commit
  2. 11 Sep, 2006 1 commit
  3. 10 Sep, 2006 1 commit
    • unknown's avatar
      ndb - bug#20612 ins-del fix in tup · e1876e84
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        allocate separate copy tuple for delete after insert or update in same tx, instead of sharing pointer to same copy tuple.  this is an easy fix independent of commit/abort order of operations
      mysql-test/r/ndb_dd_basic.result:
        test INS-DEL via assert in disk data code
      mysql-test/t/ndb_dd_basic.test:
        test INS-DEL via assert in disk data code
      e1876e84
  4. 07 Sep, 2006 3 commits
    • unknown's avatar
      Fix compilation errors in gcc -ansi -pedantic. · 60024bd2
      unknown authored
      
      storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
        Fix trailing comma in enum.
      storage/ndb/include/kernel/signaldata/CreateTable.hpp:
        Fix trailing comma in enum.
      storage/ndb/tools/listTables.cpp:
        Fix trailing comma in enum.
      60024bd2
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new-ndb · acfab88d
      unknown authored
      into  ymer.(none):/usr/local/mysql/mysql-5.1-ndb-pbsu
      
      
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      acfab88d
    • unknown's avatar
      NDB temporary tables. · 6ba27373
      unknown authored
      Temporary tables are not written to disk by DDL operations. This makes
      DDL much faster (useful for tests), but tables are lost after system
      restart.
      
      New commit, since this feature will not be available in 5.1.
      
      
      storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
        Add new error messages for temporary tables.
      storage/ndb/include/kernel/signaldata/CreateTable.hpp:
        Add new error messages for temporary tables.
      storage/ndb/include/kernel/signaldata/DiAddTab.hpp:
        Add parameter for making table temporary.
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Add parameter for making table temporary.
      storage/ndb/include/kernel/signaldata/ListTables.hpp:
        Add parameter for making table temporary.
      storage/ndb/include/ndb_constants.h:
        Add parameter for making table temporary.
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Add parameter for making table temporary.
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        Add parameter for making table temporary.
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Implement temporary tables.
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Implement temporary tables.
      storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
        Implement temporary tables.
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Implement temporary tables.
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Implement temporary tables.
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        Implement temporary tables.
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Implement temporary tables.
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Implement temporary tables.
      storage/ndb/src/ndbapi/ndberror.c:
        Add new error messages for temporary tables.
      storage/ndb/tools/listTables.cpp:
        Add display of table and index temporary status.
      6ba27373
  5. 06 Sep, 2006 4 commits
  6. 04 Sep, 2006 6 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 0be2f554
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      sql/sql_class.h:
        Auto merged
      0be2f554
    • unknown's avatar
      bug#21965 · ba6b37a0
      unknown authored
          merge to 5.1 - yet another merge fix
      
      
      sql/log.cc:
        yet another merge fix
      ba6b37a0
    • unknown's avatar
      bug#21965 · 6a81fa6d
      unknown authored
        merge to 5.1
      
      
      sql/log.h:
        merge to 5.1
      6a81fa6d
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · a00b1e3a
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      sql/log.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_class.h:
        merge
      a00b1e3a
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 14bebaa2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      sql/log.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_repl.cc:
        merge
      14bebaa2
    • unknown's avatar
      bug#21965 - replication · d2d605e4
      unknown authored
        fix deadlock if master switches log file in parallell with "show master logs"
        
      
      
      sql/log.cc:
        add raw_get_current_log which dont take log mutex
      sql/sql_class.h:
        add raw_get_current_log which dont take log mutex
      sql/sql_repl.cc:
        Fix lock order i.e first log_lock then index_lock
      d2d605e4
  7. 03 Sep, 2006 5 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 · 01debeeb
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      01debeeb
    • unknown's avatar
      ndb - bug#21754 ndb api events: fix sizes for blobs + remove expensive loop · d500c060
      unknown authored
      
      storage/ndb/test/ndbapi/test_event_merge.cpp:
        minor
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        1. fix list size info to account for blobs and merges so that cleanups and reports trigger as intended
        2. remove big poorly-local loop from free_list which affected also non-blob tables (1. was needed for this)
      storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
        1. fix list size info to account for blobs and merges so that cleanups and reports trigger as intended
        2. remove big poorly-local loop from free_list which affected also non-blob tables (1. was needed for this)
      d500c060
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 5b755031
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      5b755031
    • unknown's avatar
      ndb - · 8e1a9cd1
      unknown authored
        fix ndb-violations of strict aliasing found by gcc4.1
        (crashes in ndb_dd_*)
      
      
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Fix strict-aliasing
      storage/ndb/src/kernel/vm/KeyTable2Ref.hpp:
        Fix strict-aliasing
      storage/ndb/src/kernel/vm/Pool.hpp:
        Fix strict-aliasing
      8e1a9cd1
    • unknown's avatar
      ndb - · 3ba0b6e0
      unknown authored
        gcc-4.1.1 work-around for bug in strict-aliasing
      
      
      storage/ndb/src/kernel/blocks/restore.cpp:
        gcc-4.1.1 work-around for bug in strict-aliasing
      3ba0b6e0
  8. 02 Sep, 2006 1 commit
  9. 01 Sep, 2006 9 commits
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 1a2c5c06
      unknown authored
      into  mysql.com:/data2/mysql-5.1-new-ndb
      
      
      1a2c5c06
    • unknown's avatar
      Added missing return · 41e68be6
      unknown authored
      41e68be6
    • unknown's avatar
      Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-tree · d57163fc
      unknown authored
      into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
      
      
      mysql-test/t/disabled.def:
        SCCS merged
      d57163fc
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 7ae9f4a5
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
      
      
      7ae9f4a5
    • unknown's avatar
      Removed absolute path · 4545b4f1
      unknown authored
      4545b4f1
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · d225ffd7
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      storage/ndb/include/ndbapi/NdbTransaction.hpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
        Auto merged
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Merge
      storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
        Merge
      d225ffd7
    • unknown's avatar
      Fixed ndbapi-examples, and added tests for mysql-test-run.pl · 6138410c
      unknown authored
      
      storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile:
        BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile
      storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp:
        BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp
      storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile:
        BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile
      storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp:
        BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp
      mysql-test/include/have_ndbapi_examples.inc:
        BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/include/have_ndbapi_examples.inc
      mysql-test/t/ndbapi.test:
        BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/t/ndbapi.test
      mysql-test/t/rpl_ndbapi_multi.test:
        BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/t/rpl_ndbapi_multi.test
      mysql-test/r/have_ndbapi_examples.require:
        BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/r/have_ndbapi_examples.require
      mysql-test/r/ndbapi.result:
        BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/r/ndbapi.result
      mysql-test/r/rpl_ndbapi_multi.result:
        BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/r/rpl_ndbapi_multi.result
      6138410c
    • unknown's avatar
      Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt · 16de51bc
      unknown authored
      into  moonbone.local:/work/tmp_merge-5.1-mysql
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      16de51bc
    • unknown's avatar
      Removed Windows from tests since bug#19107 is known to hang test · 22d76f5a
      unknown authored
      
      mysql-test/t/disabled.def:
        Removed disabled test since it only affects Windows
      mysql-test/t/partition.test:
        Removed Windows from test since bug#19107 is known to hang test
      mysql-test/t/partition_mgm_err2.test:
        Removed Windows from test since bug#19107 is known to hang test
      22d76f5a
  10. 31 Aug, 2006 9 commits