1. 01 Sep, 2006 2 commits
  2. 29 Aug, 2006 5 commits
    • unknown's avatar
      merge from ndb-5.0-ndb and ndb-5.0-ndb-bj · 84b8ddad
      unknown authored
      
      ndb/src/mgmclient/CommandInterpreter.cpp:
        connect() function adds a parameter in CommandInterpreter.cpp.
      84b8ddad
    • unknown's avatar
      BUG#19873 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj · 78f2987e
      unknown authored
      into  dev3-127.(none):/mnt/mysql/home/ngb/bug19873
      
      
      ndb/src/mgmclient/CommandInterpreter.cpp:
        ndb_mgm can automatically reconnect to the ndb_mgmd after ndb_mgmd restarted.
        and this commit fixes probable mem leak
      78f2987e
    • unknown's avatar
      Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · b1f60632
      unknown authored
      into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
      
      
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      b1f60632
    • unknown's avatar
      Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/bug-21345 · c959da34
      unknown authored
      into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345
      
      
      ndb/include/util/File.hpp:
        Auto merged
      ndb/src/common/util/File.cpp:
        Auto merged
      c959da34
    • unknown's avatar
      Fix for bug #21345: Error in cluster logfile rotation. · 14f4c3b1
      unknown authored
      Fixed the cluster logfile rotation code, let the cluster log file be renamed correctly when the main log file exceeds the configured maximum size.
      
      
      ndb/include/util/File.hpp:
        Fix for bug #21345: Error in cluster logfile rotation.
      ndb/src/common/logger/FileLogHandler.cpp:
        Fix for bug #21345: Error in cluster logfile rotation.
      ndb/src/common/util/File.cpp:
        Fix for bug #21345: Error in cluster logfile rotation.
      14f4c3b1
  3. 25 Aug, 2006 1 commit
  4. 23 Aug, 2006 1 commit
  5. 22 Aug, 2006 10 commits
  6. 21 Aug, 2006 3 commits
  7. 18 Aug, 2006 4 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 141f5f43
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
      
      
      sql/examples/ha_tina.cc:
        Auto merged
      141f5f43
    • unknown's avatar
      innodb r702 · bd2028ff
      unknown authored
      innodb r719
      
      
      innobase/btr/btr0btr.c:
        innodb r702
      innobase/buf/buf0buf.c:
        innodb r702
      innobase/dict/dict0dict.c:
        innodb r702
      innobase/fil/fil0fil.c:
        innodb r702
      innobase/fsp/fsp0fsp.c:
        innodb r702
      innobase/include/btr0cur.ic:
        innodb r719
      innobase/include/buf0buf.ic:
        innodb r702
      innobase/log/log0log.c:
        innodb r702
      innobase/log/log0recv.c:
        innodb r702
      innobase/os/os0file.c:
        innodb r702
      innobase/row/row0mysql.c:
        innodb r702
      innobase/row/row0sel.c:
        innodb r702
      innobase/srv/srv0start.c:
        innodb r702
      innobase/ut/ut0dbg.c:
        innodb r702
      sql/ha_innodb.cc:
        innodb r702
      bd2028ff
    • unknown's avatar
      ndb - bug#18781 bug#21017 bug#21050 : block index ops during NR + fix asserts · d3bccdd2
      unknown authored
      
      ndb/src/kernel/vm/DLHashTable2.hpp:
        add isEmpty for use in DICT
      ndb/test/include/NDBT_Tables.hpp:
        getIndexes - return index cols of standard test table
      ndb/test/src/NDBT_Tables.cpp:
        getIndexes - return index cols of standard test table
      ndb/test/ndbapi/testDict.cpp:
        bug#21017: index create/drop during NR
      ndb/include/kernel/signaldata/CreateIndx.hpp:
        add 711
      ndb/include/kernel/signaldata/DropIndx.hpp:
        add 711
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        block index create/drop during NR.
        fix 2 ndbrequires by checking exact schema op types
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        block index create/drop during NR.
        fix 2 ndbrequires by checking exact schema op types
      d3bccdd2
    • unknown's avatar
      Merge dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-4.1/mysql-4.1-ndb-bj · c0655ffb
      unknown authored
      into  dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.0/mysql-5.0-ndb-bj
      
      
      mysql-test/t/ctype_utf8.test:
        Auto merged
      BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
        Auto merged
      BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
        Auto merged
      myisam/mi_unique.c:
        ul
        ul
        ul
      c0655ffb
  8. 17 Aug, 2006 5 commits
  9. 16 Aug, 2006 9 commits