1. 30 Sep, 2005 4 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 3827a110
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      mysql-test/r/ndb_config.result:
        Auto merged
      mysql-test/t/ndb_config.test:
        Auto merged
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Auto merged
      ndb/src/mgmsrv/InitConfigFileParser.hpp:
        Auto merged
      ndb/tools/ndb_config.cpp:
        Auto merged
      3827a110
    • unknown's avatar
      ndb - · 8c570f3f
      unknown authored
       add support for reading config.ini from ndb_config
       (as alternative to contacting ndb_mgmd)
      
      
      mysql-test/r/ndb_config.result:
        Add support for reading config.ini from ndb_config
      mysql-test/t/ndb_config.test:
        Add support for reading config.ini from ndb_config
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Handle prinouts better
      ndb/src/mgmsrv/InitConfigFileParser.hpp:
        Handle prinouts better
      ndb/tools/ndb_config.cpp:
        Add support for reading config.ini from ndb_config
      8c570f3f
    • unknown's avatar
      wl#1882 · b55ad590
      unknown authored
        allow ndb_mgmd to use my.cnf for cluster configuration
      
      
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Depricate Id infavor of nodeid in config.ini
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Add support for getting cluster config from my.cnf [cluster_config]
      ndb/src/mgmsrv/InitConfigFileParser.hpp:
        Add support for getting cluster config from my.cnf [cluster_config]
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Add support for getting cluster config from my.cnf [cluster_config]
      ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
        Add support for getting cluster config from my.cnf [cluster_config]
      ndb/src/mgmsrv/main.cpp:
        Add support for getting cluster config from my.cnf [cluster_config]
      b55ad590
    • unknown's avatar
      export forced_defaults_file using global variable defaults_file · 3b49f80a
      unknown authored
       analog with defaults_extra_file and defaults_grouop_suffix
      
      
      include/my_sys.h:
        export forced_defaults_file using global variable defaults_file
      mysys/default.c:
        export forced_defaults_file using global variable defaults_file
      3b49f80a
  2. 22 Sep, 2005 5 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 6532bfdd
      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
      6532bfdd
    • unknown's avatar
      Add testcase for bug#13316 · 8e78ba93
      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
      8e78ba93
    • unknown's avatar
      bug#13316 · 86713962
      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
      86713962
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · c6a5e9a3
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/ndbapi/Ndbinit.cpp:
        Auto merged
      c6a5e9a3
    • unknown's avatar
      ndb - fix gcc4 compile problem · 449fb0b1
      unknown authored
      
      ndb/src/ndbapi/Ndbinit.cpp:
        fix gcc4 compile problem
      449fb0b1
  3. 21 Sep, 2005 3 commits
    • unknown's avatar
      ndb merge fix · b63df84b
      unknown authored
      b63df84b
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · cf358493
      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
      cf358493
    • unknown's avatar
      bug#12950 · 3c8a296f
      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
      3c8a296f
  4. 20 Sep, 2005 3 commits
    • unknown's avatar
      ndb - post merge fixes · 16328ca2
      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
      16328ca2
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 130e902c
      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
      130e902c
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8e2d318b
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      8e2d318b
  5. 19 Sep, 2005 16 commits
  6. 18 Sep, 2005 5 commits
  7. 17 Sep, 2005 3 commits
  8. 16 Sep, 2005 1 commit