1. 12 Apr, 2007 20 commits
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user · e6c8de9e
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
      
      e6c8de9e
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · ecffbf87
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/include/ndbapi/NdbRecAttr.hpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbRecAttr.cpp:
        Auto merged
      ecffbf87
    • unknown's avatar
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt · d954c192
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
      
      d954c192
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt · 6a9776da
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
      
      6a9776da
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · 92447690
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt
      
      92447690
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user · 9eeb801f
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
      
      9eeb801f
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 36b6a8d7
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
      
      36b6a8d7
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · df7ff478
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      df7ff478
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 84227177
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Auto merged
      storage/ndb/test/include/HugoOperations.hpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      storage/ndb/test/src/HugoOperations.cpp:
        Auto merged
      storage/ndb/test/src/HugoTransactions.cpp:
        Auto merged
      storage/ndb/include/kernel/AttributeHeader.hpp:
        merge
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        merge
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        merge
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        merge
      storage/ndb/test/ndbapi/testBasic.cpp:
        merge
      84227177
    • unknown's avatar
      ndb - bug#27756 · dc8d4699
      unknown authored
        make sure that copy tuple is released in all cases
      
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        make sure that copy tuple is released in all cases
      storage/ndb/test/run-test/daily-basic-tests.txt:
        add testcase
      dc8d4699
    • unknown's avatar
      ndb - bug#27756 · ebadeef4
      unknown authored
        testcase only
        new pseudo column NDB$COPY_ROWID
      
      
      storage/ndb/include/kernel/AttributeHeader.hpp:
        Add new pseudo column for reading location of copy tuple
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Add new pseudo column for reading location of copy tuple
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Add new pseudo column for reading location of copy tuple
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Add new pseudo column for reading location of copy tuple
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Add new pseudo column for reading location of copy tuple
      storage/ndb/test/ndbapi/testBasic.cpp:
        add testcase for bug#27756
      ebadeef4
    • unknown's avatar
      ndb - hugo - add new method for setting primary key(s) · c3ca248b
      unknown authored
      
      storage/ndb/test/include/HugoOperations.hpp:
        Add method for setting of primary key
      storage/ndb/test/src/HugoAsynchTransactions.cpp:
        Add method for setting of primary key
      storage/ndb/test/src/HugoOperations.cpp:
        Add method for setting of primary key
      storage/ndb/test/src/HugoTransactions.cpp:
        Add method for setting of primary key
      c3ca248b
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 4e946606
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      4e946606
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 94f9da5e
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/tools/restore/consumer_restore.cpp:
        Auto merged
      storage/ndb/tools/restore/restore_main.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        null merge, 5.1 already reports correct error
      mysql-test/r/ndb_restore.result:
        manual merge
      mysql-test/t/ndb_restore.test:
        manual merge
      94f9da5e
    • unknown's avatar
      Bug #27758 Restoring NDB backups makes table usable in SQL nodes · dfd00029
      unknown authored
      - parse indexname using "split" instead of sscanf, as not to break at space
      - test case with space in key
      - enclose names in printout
      
      
      mysql-test/r/ndb_restore.result:
        Bug #27758 Restoring NDB backups makes table usable in SQL nodes
        - change to using an index with space to reproduce bug
      mysql-test/t/ndb_restore.test:
        Bug #27758 Restoring NDB backups makes table usable in SQL nodes
        - change to using an index with space to reproduce bug
      ndb/tools/restore/consumer_restore.cpp:
        Bug #27758 Restoring NDB backups makes table usable in SQL nodes
        - parse indexname using "split" instead of sscanf, as not to break at space
        - enclose names in printout
      ndb/tools/restore/restore_main.cpp:
        Bug #27758 Restoring NDB backups makes table usable in SQL nodes
        - enclose names in printout
      sql/ha_ndbcluster.cc:
        Bug #27758 Restoring NDB backups makes table usable in SQL nodes
        - correct error message
      dfd00029
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 70d1fd45
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      mysql-test/r/ndb_dd_basic.result:
        Auto merged
      mysql-test/t/ndb_dd_basic.test:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        Auto merged
      70d1fd45
    • unknown's avatar
      ndb - mysql-test-run testcase for bug#27757 · 4380cabe
      unknown authored
      
      mysql-test/r/ndb_dd_basic.result:
        testcase
      mysql-test/t/ndb_dd_basic.test:
        testcase
      4380cabe
    • unknown's avatar
      ndb - bug#27757 · 6c3c2ecf
      unknown authored
        tupscan misses uncommitted inserts by own transaction
          let tupkeyreq handle dirty/savepoint
      
        also siable diskscan as temporary fix for bug#27776
      
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        let tupkeyreq handle dirty/savepoint
      6c3c2ecf
    • unknown's avatar
      Post-merge fixes. · 767c9f75
      unknown authored
      767c9f75
  2. 11 Apr, 2007 20 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 51d01a86
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.1-opt
      
      
      mysql-test/r/distinct.result:
        Auto merged
      mysql-test/r/row.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Manual merge
      51d01a86
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 6e35d0d0
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.0-opt
      
      6e35d0d0
    • unknown's avatar
      Post-merge fix. · 2ccafd29
      unknown authored
      2ccafd29
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug27484 · e0949169
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.0-opt
      
      
      mysql-test/t/row.test:
        Auto merged
      mysql-test/r/row.result:
        Manual merge
      sql/item_cmpfunc.cc:
        Manual merge
      e0949169
    • unknown's avatar
      Fixed bug #27484: a crash when incompatible row expressions with nested rows · 71c2aa50
      unknown authored
      are used as arguments of the IN predicate.
      Added a function to check compatibility of row expressions. Made sure that this
      function to be called for Item_func_in objects by fix_length_and_dec().
      
      
      mysql-test/r/row.result:
        Added a test case for bug #27484.
      mysql-test/t/row.test:
        Added a test case for bug #27484.
      71c2aa50
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 7c291173
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/src/ndbapi/Ndb.cpp:
        Auto merged
      storage/ndb/src/ndbapi/Ndbif.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        null merge
      7c291173
    • unknown's avatar
      remove warning · 1dd19799
      unknown authored
      1dd19799
    • unknown's avatar
      correct merge error · d06dc296
      unknown authored
      d06dc296
    • unknown's avatar
      missing return · 775e03de
      unknown authored
      775e03de
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 1414c04d
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      1414c04d
    • unknown's avatar
      Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 · 988417ec
      unknown authored
      - try to catch as many malloc failures as possible and give error messages
      (more for 5.1)
      
      
      storage/ndb/src/ndbapi/ObjectMap.cpp:
        Rename: ndb/src/ndbapi/ObjectMap.cpp -> storage/ndb/src/ndbapi/ObjectMap.cpp
      988417ec
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · e41deaa0
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/src/ndbapi/NdbImpl.hpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbOperation.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbRecAttr.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbReceiver.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbScanFilter.cpp:
        Auto merged
      storage/ndb/include/ndbapi/NdbReceiver.hpp:
        Auto merged
      storage/ndb/include/ndbapi/NdbTransaction.hpp:
        Auto merged
      storage/ndb/include/util/BaseString.hpp:
        Auto merged
      storage/ndb/src/common/util/BaseString.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      storage/ndb/src/ndbapi/Ndbif.cpp:
        Auto merged
      storage/ndb/src/ndbapi/Ndblist.cpp:
        Auto merged
      storage/ndb/src/ndbapi/SignalSender.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
        - manual merge to 5.1
      storage/ndb/include/ndbapi/Ndb.hpp:
        Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
        - manual merge to 5.1
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
        - manual merge to 5.1
      storage/ndb/include/util/Vector.hpp:
        Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
        - manual merge to 5.1
      storage/ndb/src/ndbapi/DictCache.cpp:
        Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
        - manual merge to 5.1
      storage/ndb/src/ndbapi/DictCache.hpp:
        Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
        - manual merge to 5.1
      storage/ndb/src/ndbapi/Makefile.am:
        Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
        - manual merge to 5.1
      storage/ndb/src/ndbapi/Ndb.cpp:
        Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
        - manual merge to 5.1
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
        - manual merge to 5.1
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
        - manual merge to 5.1
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
        - manual merge to 5.1
      storage/ndb/src/ndbapi/ObjectMap.hpp:
        Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
        - manual merge to 5.1
      e41deaa0
    • unknown's avatar
      Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 · 660afeae
      unknown authored
      - try to catch as many malloc failures as possible and give error messages
      
      
      ndb/src/ndbapi/ObjectMap.cpp:
        New BitKeeper file ``ndb/src/ndbapi/ObjectMap.cpp''
      660afeae
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 3478268c
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B19372-5.0-opt
      
      3478268c
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 93202206
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        Auto merged
      93202206
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · c111842e
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      c111842e
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · e5b3a4d8
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      e5b3a4d8
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 2b76522e
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
      
      2b76522e
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · b313ae3b
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        Auto merged
      b313ae3b
    • unknown's avatar
      ndb - bug#27748 · 5ecdd6db
      unknown authored
        fix commit trigger on multi-update
      
      
      ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        fix commit trigger on multi-update
      5ecdd6db