1. 09 Feb, 2007 3 commits
  2. 08 Feb, 2007 1 commit
  3. 07 Feb, 2007 12 commits
  4. 06 Feb, 2007 11 commits
  5. 05 Feb, 2007 13 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 949381c2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      949381c2
    • unknown's avatar
      ndb - some more hugo abort option fix · 3a8a328e
      unknown authored
      
      storage/ndb/test/src/HugoTransactions.cpp:
        restore some accidently removed hugo code
      storage/ndb/test/src/UtilTransactions.cpp:
        one more abort option fix
      3a8a328e
    • unknown's avatar
      ndb - · 598b8dfd
      unknown authored
      Add abort option to lots of Hugo code, 
      as it assumes it and default value has changed
      
      
      storage/ndb/test/src/HugoTransactions.cpp:
        Add abort option to lots of Hugo code, 
        as it assumes it and default value has changed
      storage/ndb/test/src/UtilTransactions.cpp:
        Add abort option to lots of Hugo code, 
        as it assumes it and default value has changed
      598b8dfd
    • unknown's avatar
      ndb - bug#25801 · 0a27a90a
      unknown authored
        - improve error message if starting wo/ enough REDO
        - decrease likelyhood of trying to start too early
      
      
      storage/ndb/include/mgmapi/ndbd_exit_codes.h:
        Add new error code (that maybe should have been there a looong time)
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Add new check (during SR) for that sufficient REDO is present
          before continuing SR
      storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Add list of GCI's of nodes so that we can check for sufficient REDO during a SR
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Add check for REDO during SR
          so that
        1) cluster is not trying to start too soon
        2) a better error message (than internal error) is provided if not enough REDO is present
      storage/ndb/src/kernel/error/ndbd_exit_codes.c:
        Add new error code (that maybe should have been there a looong time)
      0a27a90a
    • unknown's avatar
      Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga · 72d99ac2
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      72d99ac2
    • unknown's avatar
      Bug #26021 valgrind warning handle_trailing_share/ndbcluster_free_share invalid read · fa839ece
      unknown authored
      - revert bugfix, needs more work
      
      
      fa839ece
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 891222d1
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      891222d1
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · c52165de
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      BUILD/SETUP.sh:
        Auto merged
      Makefile.am:
        Auto merged
      client/mysql.cc:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysys/default.c:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      storage/myisammrg/ha_myisammrg.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Manually merged.
      c52165de
    • unknown's avatar
      Fix false Valgrind warning. · e3ddf925
      unknown authored
      On some compiler/platform combination, an assignment of form *p= *p
      would map to a memcpy() call, and Valgrind flags this as an overlapped
      memcpy() error.
      
      Fix by prefixing *p= *q with if(p!=q) when building for Valgrind
      (HAVE_purify).
      
      
      sql/sql_select.cc:
        Fix false valgrind warning.
      e3ddf925
    • unknown's avatar
      Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga · 2b39a66d
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      2b39a66d
    • unknown's avatar
      Bug #26021 - valgrind reports error regarding handle_trailing_share and client thread share usage · dd01c46f
      unknown authored
      - add ndb_share connect_count to decide if share can be reused to setup replication
      
      
      sql/ha_ndbcluster.cc:
        add additional logging info
        remove inline real_free_share (not needed) and confuses valgrind printout
      sql/ha_ndbcluster.h:
        add connect_count to ndb_share to enable checking for version of share
      sql/ha_ndbcluster_binlog.cc:
        use ndb_share connect_count to decide if share can be reused to setup replication
        - share will be created early if table is accessed prior to handler setting up binlog stuff, see bug 26021
      sql/ha_ndbcluster_binlog.h:
        remove inline real_free_share (not needed) and confuses valgrind printout
      dd01c46f
    • unknown's avatar
      Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga · 4db67f51
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      4db67f51
    • unknown's avatar
      corrected merge error · af9d2e24
      unknown authored
      af9d2e24