1. 24 Mar, 2006 15 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · bd3cbbe5
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      
      bd3cbbe5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 9d9ac1b0
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      9d9ac1b0
    • unknown's avatar
      disabled.def: · 1469ff41
      unknown authored
        enabled rpl_ndb_blob since a "hanging" bug was fixed
      
      
      mysql-test/t/disabled.def:
        enabled rpl_ndb_blob since a "hanging" bug was fixed
      1469ff41
    • unknown's avatar
      ndb - bug#18295 · f2e9a5cf
      unknown authored
        more work-arounds for gcc4
      
      
      storage/ndb/src/kernel/vm/Pool.hpp:
        More gcc4 craziness
      f2e9a5cf
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 655139c9
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-new
      
      
      655139c9
    • unknown's avatar
      ndb - · bf3c1e18
      unknown authored
        more compiler warnings...
      
      
      storage/ndb/include/util/InputStream.hpp:
        more warnings
      bf3c1e18
    • unknown's avatar
      ndb - · 6c9618d1
      unknown authored
        still some compiler warnings
      
      
      storage/ndb/include/util/OutputStream.hpp:
        still some compiler warnings
      storage/ndb/include/util/SimpleProperties.hpp:
        still some compiler warnings
      storage/ndb/src/kernel/vm/Pool.hpp:
        still some compiler warnings
      6c9618d1
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb · cb7aa5ab
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      
      cb7aa5ab
    • unknown's avatar
      Merge ndbdev@ndbmaster.mysql.com:jonas/mysql-5.1-new · d5923377
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      
      d5923377
    • unknown's avatar
      - corrected bug causing hang in getTable when using blob tables · c2e4ef09
      unknown authored
      - make sure cluster/schema table is always created first
      
      
      sql/ha_ndbcluster_binlog.cc:
        make sure cluster/schema table is always created first
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        corrected bug causing hang in getTable when using blob tables
      c2e4ef09
    • unknown's avatar
      after merge fix · ec67344e
      unknown authored
      ec67344e
    • unknown's avatar
      ndb - bug#18295 · 118f8b2e
      unknown authored
        rewrite/clean up code a bit to avoid a gcc4 compiler bug
      
      
      storage/ndb/src/kernel/vm/DLFifoList.hpp:
        Fix compiler bug
      storage/ndb/src/kernel/vm/DLList.hpp:
        Fix compiler bug
      storage/ndb/src/kernel/vm/SLList.hpp:
        Fix compiler bug
      118f8b2e
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new · b65db0cb
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
      
      
      b65db0cb
    • unknown's avatar
      ndb - merge fixes · 61e3fea2
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        merge
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        merge
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        merge
      storage/ndb/src/ndbapi/Ndbif.cpp:
        merge
      61e3fea2
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · b70b7556
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      
      mysql-test/lib/mtr_timer.pl:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
        Auto merged
      storage/ndb/include/kernel/signaldata/StartPerm.hpp:
        Auto merged
      storage/ndb/include/kernel/signaldata/TcContinueB.hpp:
        Auto merged
      storage/ndb/include/mgmapi/ndbd_exit_codes.h:
        Auto merged
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      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/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      storage/ndb/src/kernel/error/ndbd_exit_codes.c:
        Auto merged
      storage/ndb/src/kernel/vm/TransporterCallback.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      storage/ndb/src/ndbapi/Ndbif.cpp:
        Auto merged
      storage/ndb/src/ndbapi/TransporterFacade.cpp:
        Auto merged
      storage/ndb/test/include/NdbRestarter.hpp:
        Auto merged
      storage/ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testSystemRestart.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testTimeout.cpp:
        Auto merged
      storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
        Auto merged
      storage/ndb/test/run-test/conf-dl145a.txt:
        Auto merged
      storage/ndb/test/run-test/conf-ndbmaster.txt:
        Auto merged
      storage/ndb/test/run-test/ndb-autotest.sh:
        Auto merged
      storage/ndb/test/src/NdbRestarter.cpp:
        Auto merged
      storage/ndb/test/run-test/conf-shark.txt:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        merge
      storage/ndb/src/ndbapi/TransporterFacade.hpp:
        merge
      storage/ndb/test/run-test/Makefile.am:
        merge
      storage/ndb/test/run-test/daily-basic-tests.txt:
        merge
      storage/ndb/tools/desc.cpp:
        merge
      b70b7556
  2. 23 Mar, 2006 25 commits