1. 06 Feb, 2007 9 commits
  2. 05 Feb, 2007 15 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
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · e21cdc61
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      mysql-test/r/ndb_read_multi_range.result:
        Auto merged
      mysql-test/t/ndb_read_multi_range.test:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      storage/ndb/src/common/debugger/EventLogger.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/suma/Suma.cpp:
        Auto merged
      storage/ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/main.cpp:
        Auto merged
      storage/ndb/src/ndbapi/Ndb.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbBlob.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbIndexStat.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbOperationExec.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        manual merge
      storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
        manual merge
      e21cdc61
    • unknown's avatar
      Bug #26019 - valgrind warning ndbcluster_log_schema_op/safe_mutex_lock invalid read · c101bc1f
      unknown authored
      protect the setting of ndb_schema_share = NULL with a mutex
      
      
      sql/ha_ndbcluster_binlog.cc:
        protect the setting of ndb_schema_share = NULL with a mutec
      c101bc1f
  3. 04 Feb, 2007 2 commits
  4. 03 Feb, 2007 3 commits
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 34414314
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      mysql-test/Makefile.am:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      storage/csv/ha_tina.h:
        Auto merged
      34414314
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 9e01ae9f
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      BUILD/SETUP.sh:
        Auto merged
      configure.in:
        Auto merged
      BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
        Auto merged
      BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
        Auto merged
      BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
        Auto merged
      BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
        Auto merged
      BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
        Auto merged
      client/mysql.cc:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      sql/gen_lex_hash.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Manual merged
      support-files/mysql.spec.sh:
        Manual merged
      9e01ae9f
    • unknown's avatar
      After merge fix · d3c1511a
      unknown authored
      d3c1511a
  5. 02 Feb, 2007 11 commits
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · 3f3d9093
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
      
      
      BUILD/SETUP.sh:
        Auto merged
      client/mysql.cc:
        Auto merged
      configure.in:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/archive/ha_archive.cc:
        Auto merged
      plugin/daemon_example/daemon_example.cc:
        Merged with main 5.1
      sql/mysqld.cc:
        Merged with main 5.1
      3f3d9093
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 8a9c521b
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      sql/handler.cc:
        Auto merged
      sql/examples/ha_tina.cc:
        Auto merged
      sql/examples/ha_tina.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      mysql-test/Makefile.am:
        Manual merged
      8a9c521b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3c0aca02
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      sql/item_func.cc:
        Auto merged
      3c0aca02
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0dc19dad
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      
      0dc19dad
    • unknown's avatar
      After merge fix · 98b9ac69
      unknown authored
      98b9ac69
    • unknown's avatar
      After merge fix · 4df381fd
      unknown authored
      4df381fd
    • unknown's avatar
      ndb - bug#25984 - more than 7 failed node restart can cause cluster failure · 6acbe4eb
      unknown authored
      new behaviour is as follows:
      1) node is refused to start, and should fail with message in error log that it must be restarted --initial
      2) if cluster failure in this situation, node must also be restarted --intial
         if not SR will fail, with this message
      
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Prevent node from starting _at all_ if it has performed more than 6 failed
          node restart.
      storage/ndb/test/ndbapi/testNodeRestart.cpp:
        test prg 25984
      storage/ndb/test/run-test/daily-basic-tests.txt:
        testcase
      6acbe4eb
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · ba2e81e0
      unknown authored
      into  eel.(none):/home/jonas/src/51-work
      
      
      storage/ndb/test/tools/listen.cpp:
        Auto merged
      ba2e81e0
    • unknown's avatar
      ndb - test prg · 55930996
      unknown authored
        fix failure during start
      
      
      storage/ndb/test/tools/listen.cpp:
        fix failure during start
      55930996
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 354dad82
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      354dad82
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · d08299de
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      d08299de