1. 22 Sep, 2005 5 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 0db66e24
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      mysql-test/r/ndb_alter_table.result:
        Auto merged
      mysql-test/t/ndb_alter_table.test:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      0db66e24
    • unknown's avatar
      Add testcase for bug#13316 · 3dfdb256
      unknown authored
        ndb big alter table
      
      
      mysql-test/r/ndb_alter_table.result:
        Add testcase for bug#13316
      mysql-test/t/ndb_alter_table.test:
        Add testcase for bug#13316
      3dfdb256
    • unknown's avatar
      bug#13316 · 285fee67
      unknown authored
        ndb alter table with big dicttabinfo
        send alter_tab_req fragmented as signal can get larger than MAX_MESSAGE_SIZE
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        DictTabInfo used during alter table can easily becom larger than MAX_MESSAGE_SIZE
          send fragmented instead
      285fee67
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · bdeec8f2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/ndbapi/Ndbinit.cpp:
        Auto merged
      bdeec8f2
    • unknown's avatar
      ndb - fix gcc4 compile problem · 55928842
      unknown authored
      
      ndb/src/ndbapi/Ndbinit.cpp:
        fix gcc4 compile problem
      55928842
  2. 21 Sep, 2005 3 commits
    • unknown's avatar
      ndb merge fix · e2845b48
      unknown authored
      e2845b48
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 8ce8ef20
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        merge
      8ce8ef20
    • unknown's avatar
      bug#12950 · d9adfe17
      unknown authored
          ndb backup with charsets and simultanious updates
          make sure that backup _dont_ read xfrm data
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Backup can do dirty read
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Fix so that backup dont read xfrm data
      ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        Fix so that backup dont read xfrm data
      d9adfe17
  3. 20 Sep, 2005 3 commits
    • unknown's avatar
      ndb - post merge fixes · 5a5b91de
      unknown authored
      
      ndb/include/ndbapi/NdbTransaction.hpp:
        post merge fixes
      ndb/src/ndbapi/Ndblist.cpp:
        post merge fixes
      sql/ha_ndbcluster.cc:
        post merge fixes
      5a5b91de
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 6d576bd3
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/include/ndbapi/NdbBlob.hpp:
        Auto merged
      ndb/include/ndbapi/NdbOperation.hpp:
        Auto merged
      ndb/include/ndbapi/NdbRecAttr.hpp:
        Auto merged
      ndb/src/ndbapi/NdbApiSignal.cpp:
        Auto merged
      ndb/src/ndbapi/NdbApiSignal.hpp:
        Auto merged
      ndb/src/ndbapi/NdbBlob.cpp:
        Auto merged
      ndb/src/ndbapi/NdbRecAttr.cpp:
        Auto merged
      ndb/src/ndbapi/Ndbif.cpp:
        Auto merged
      ndb/src/ndbapi/Ndbinit.cpp:
        Auto merged
      ndb/test/include/NDBT_Test.hpp:
        Auto merged
      ndb/test/ndbapi/bank/BankLoad.cpp:
        Auto merged
      ndb/test/ndbapi/testOIBasic.cpp:
        Auto merged
      ndb/test/src/NdbBackup.cpp:
        Auto merged
      ndb/test/src/NdbRestarts.cpp:
        Auto merged
      ndb/tools/restore/Restore.cpp:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      ndb/include/ndbapi/Ndb.hpp:
        merge
      ndb/include/ndbapi/NdbIndexOperation.hpp:
        merge
      ndb/include/ndbapi/NdbIndexScanOperation.hpp:
        merge
      ndb/include/ndbapi/NdbTransaction.hpp:
        merge
      ndb/src/ndbapi/NdbImpl.hpp:
        merge
      ndb/src/ndbapi/Ndblist.cpp:
        merge
      ndb/test/src/HugoCalculator.cpp:
        merge
      ndb/test/src/NDBT_Test.cpp:
        merge
      sql/ha_ndbcluster.cc:
        merge
      sql/mysqld.cc:
        merge
      sql/sql_lex.h:
        merge
      sql/sql_parse.cc:
        merge
      6d576bd3
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8dba389b
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      8dba389b
  4. 19 Sep, 2005 16 commits
  5. 18 Sep, 2005 5 commits
  6. 17 Sep, 2005 3 commits
  7. 16 Sep, 2005 5 commits