1. 30 Sep, 2005 21 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 710a2e29
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
        Auto merged
      710a2e29
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · d3febe80
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      include/my_sys.h:
        Auto merged
      mysys/default.c:
        Auto merged
      d3febe80
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 8aebd062
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/tools/ndb_config.cpp:
        merge
      8aebd062
    • unknown's avatar
      ndb_config · 7337ba76
      unknown authored
        Check returnvalue on load/fetch configuration
      
      
      ndb/tools/ndb_config.cpp:
        Check returnvalue on load/fetch configuration
      7337ba76
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0a467b5f
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-sept30-test
      
      
      0a467b5f
    • unknown's avatar
      BUG#13081: Disable ROR-index_merge for NDB tables (by adding a · b8ad9d14
      unknown authored
      HA_KEY_SCAN_NOT_ROR index flag) as NDB index scans are not guaranteed to be ROR 
      scans. 
      
      
      b8ad9d14
    • unknown's avatar
      ndb · dbc72145
      unknown authored
        Add support/test for using my.cnf [cluster_config]
      
      
      mysql-test/r/ndb_config.result:
        Add support for ndb_config to read my.cnf
      mysql-test/t/ndb_config.test:
        Add support for ndb_config to read my.cnf
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        merge
      ndb/tools/ndb_config.cpp:
        Add support for ndb_config to read my.cnf
      mysql-test/std_data/ndb_config_mycnf1.cnf:
        New BitKeeper file ``mysql-test/std_data/ndb_config_mycnf1.cnf''
      dbc72145
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 60ee9326
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      60ee9326
    • unknown's avatar
      duplicate error message removed · 31f7a0e8
      unknown authored
      
      mysql-test/r/innodb.result:
        after merge fix
      31f7a0e8
    • 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
      Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not... · 1e148ca4
      unknown authored
      Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.
      
      
      client/mysqlbinlog.cc:
        tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog)
      mysql-test/r/ctype_ucs_binlog.result:
        update
      mysql-test/r/mysqlbinlog.result:
        update
      mysql-test/r/mysqlbinlog2.result:
        update
      mysql-test/r/rpl_charset.result:
        update
      mysql-test/r/rpl_timezone.result:
        update
      mysql-test/r/user_var-binlog.result:
        update
      1e148ca4
    • 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
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 203bb8bc
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      mysql-test/r/mysqldump.result:
        Auto merged
      203bb8bc
    • unknown's avatar
      Comment adjusted (see fix for #13545) · 33313992
      unknown authored
      33313992
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3c5ae70e
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-5.0
      
      
      3c5ae70e
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3a806cd6
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      3a806cd6
    • unknown's avatar
      more post-merge fixes for SingleUser log events · 62233c20
      unknown authored
      
      ndb/include/mgmapi/ndb_logevent.h:
        more post-merge fixes
      ndb/src/mgmapi/ndb_logevent.cpp:
        more post-merge fixes
      62233c20
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · ec5df5f2
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug13455
      
      
      ec5df5f2
    • unknown's avatar
      0c8d29e0
  2. 29 Sep, 2005 19 commits