Skip to content

M
MariaDB
Switch branch/tag
  1. 16 Feb, 2007 14 commits
  3. 15 Feb, 2007 5 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · d2422d84
      unknown authored 
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/test/run-test/main.cpp:
  Auto merged
      d2422d84
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 6f4d5b62
      unknown authored 
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
      6f4d5b62
    • unknown's avatar
      ndb - new atrt · 73a1eba2
      unknown authored 
          Fix bug when restarting cluster after failure
      (fs was not cleared)
    Fix cosmetic bug that made rsync be run several times when gathering result


storage/ndb/test/run-test/main.cpp:
  Fix bug when restarting cluster after failure
    (fs was not cleared)
  Fix cosmetic bug that made rsync be run several times when gathering result
      73a1eba2
    • unknown's avatar
      ndb - · 4dbc2058
      unknown authored 
        fix ao_ignore behavior change in hugo
  (affecting testOperations & testTransactions)


storage/ndb/test/src/HugoOperations.cpp:
  fix ao_ignore behavior change in hugo
      4dbc2058
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · af8499a6
      unknown authored 
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/item_func.cc:
  Auto merged
      af8499a6
  5. 14 Feb, 2007 21 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · dac90b33
      unknown authored 
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
      dac90b33
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 54a6cd61
      unknown authored 
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/mysql_priv.h:
  Auto merged
      54a6cd61
    • unknown's avatar
      corrected manual merge · fab6b257
      unknown authored
      fab6b257
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb · 7e56314c
      unknown authored 
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  SCCS merged
      7e56314c
    • unknown's avatar
      Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb · b088acad
      unknown authored 
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


BitKeeper/deleted/.del-ndb_config_1_node.ini:
  Delete: mysql-test/ndb/ndb_config_1_node.ini
BitKeeper/deleted/.del-ndb_config_4_node.ini:
  Delete: mysql-test/ndb/ndb_config_4_node.ini
      b088acad
    • unknown's avatar
      ndb_config_4_node.ini, ndb_config_1_node.ini: · 928538be
      unknown authored 
        new file
      928538be
    • unknown's avatar
      Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb · 7666ccf0
      unknown authored 
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/ndb/ndb_config_2_node.ini:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/ndbapi/ObjectMap.hpp:
  Auto merged
mysql-test/ndb/ndbcluster.sh:
  manual merge
      7666ccf0
    • unknown's avatar
      backport some mysql-test ndbcluster things from 5.1 · 0b5724df
      unknown authored 
          remove compiler warning EventLogger.cpp
    Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
     - partial fix
     - object map to handle failed realloc



mysql-test/ndb/ndb_config_2_node.ini:
  backport some mysql-test ndbcluster things from 5.1
mysql-test/ndb/ndbcluster.sh:
  backport some mysql-test ndbcluster things from 5.1
ndb/src/common/debugger/EventLogger.cpp:
  remove compiler warning
ndb/src/ndbapi/ObjectMap.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
   - partial fix
   - object map to handle failed realloc
      0b5724df
    • unknown's avatar
      Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca · 9f083d27
      unknown authored 
      into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
      9f083d27
    • unknown's avatar
      Bug #21033 Error 0 in readAutoIncrementValue() · 02f05e48
      unknown authored 
      - do not call function if table has no autoincrement
      02f05e48
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work · 4fd944b9
      unknown authored 
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge
      4fd944b9
    • unknown's avatar
      BUG#20121 missing err msg for ENOSPC · bae90fb9
      unknown authored 
      getting BACKUP_FRAGMENT_REF in LQH from BACKUP would bail on
ndbrequire(false) instead of having good error message.

Can re-use error code from BACKUP as it's a FsRef error code,
which is NDBD_EXIT... except when it isn't.


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Report the correct error code on exit with failure to backup fragment (run LCP)
      bae90fb9
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work · ed52ee88
      unknown authored 
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/common/util/OutputStream.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  merge
storage/ndb/include/util/OutputStream.hpp:
  merge
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  merge
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  merge
      ed52ee88
    • unknown's avatar
      BUG#26358 remove unused and non-working SET_VAR_REQ/CONF signals · b9b2b083
      unknown authored 
      remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing

Remove the dead SET_VAR_REQ,REF,CONF signals.

They:
a) don't currently work
b) will cause confusion with future mgmd updates for
   signal interface to configuration things (e.g. port numbers)


ndb/include/kernel/GlobalSignalNumbers.h:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/mgmsrv/MgmtSrvr.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
      b9b2b083
    • unknown's avatar
      Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb · f3d5e443
      unknown authored 
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  manual merge
storage/ndb/src/ndbapi/SignalSender.cpp:
  manual merge
      f3d5e443
    • unknown's avatar
      BUG#26357 remove unused GSN_STATISTICS_REQ and CONF · 63e75ad9
      unknown authored 
      remove GSN_STATISTICS_REQ and CONF

These are unused and have been since BK import. not needed.


ndb/include/kernel/GlobalSignalNumbers.h:
  remove STATISTICS_REQ and CONF
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  remove signal names for STATISTICS_REQ and CONF (unused)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  remove unused STATISTICS signals
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  remove unused STATISTICS signals
      63e75ad9
    • unknown's avatar
      BUG#26356 uninitialised data sent from TAMPER_ORD to DIHNDBTAMPER · b944b351
      unknown authored 
      Don't send uninit data in TAMPER_ORD to DIHNDBTAMPER

Even though this data is unused from the CMVMI (mgmd) signal,
we shouldn't be doing stuff with uninited data.


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  init the 3rd word of DIHNDBTAMPER before sending to DIH.
      b944b351
    • unknown's avatar
      BUG#26355 FIXME: use constant for max loglevel in ndb_mgmd · 2aa52f6b
      unknown authored 
      
ndb/include/mgmapi/mgmapi.h:
  use constant for max log level in ndb_mgmd.
  
  (more useful in 5.1 due to other defines and refinements of mgmapi)
ndb/src/mgmsrv/Services.cpp:
  fix the XXX fixme of constant for max log level
      2aa52f6b
    • unknown's avatar
      BUG#26353 remove GET_CONFIG_BACKWARDS_COMPAT from ndb_mgmd · 53eecff3
      unknown authored 
      there is backwards compatibility for GET CONFIG style configuration requests in
ndb_mgmd. None of the ndbd versions that use this couldn't possibly connect to a
5.0 or 5.1 cluster. remove the backwards compat

remove it


ndb/src/mgmsrv/Services.cpp:
  remove MGM_GET_CONFIG_BACKWARDS_COMPAT code.
  
  any client using GET CONFIG will just not work with modern NDB.
ndb/src/mgmsrv/Services.hpp:
  remove GET CONFIG support
      53eecff3
    • unknown's avatar
      BUG#26352 unused ndb_mgm_rep_command in mgmapi.cpp · 03e9ee02
      unknown authored 
      
ndb/src/mgmapi/mgmapi.cpp:
  remove ndb_mgm_rep_command function
      03e9ee02
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4c314f71
      unknown authored 
      into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
      4c314f71
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7