Commits · ab40333b215f4a7ac9ef9f64c6bcc86e1f9ab7b9 · nexedi / MariaDB

14 Feb, 2007 9 commits

BUG#20121 missing err msg for ENOSPC · ab40333b

unknown authored Feb 14, 2007

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)

ab40333b

Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work · 165491a4

unknown authored Feb 14, 2007

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

165491a4

BUG#26358 remove unused and non-working SET_VAR_REQ/CONF signals · 6f334b55

unknown authored Feb 14, 2007

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)

6f334b55

BUG#26357 remove unused GSN_STATISTICS_REQ and CONF · f8a679e9

unknown authored Feb 14, 2007

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

f8a679e9

BUG#26356 uninitialised data sent from TAMPER_ORD to DIHNDBTAMPER · cea0d57d

unknown authored Feb 14, 2007

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.

cea0d57d

BUG#26355 FIXME: use constant for max loglevel in ndb_mgmd · e953dd8a

unknown authored Feb 14, 2007


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

e953dd8a

BUG#26353 remove GET_CONFIG_BACKWARDS_COMPAT from ndb_mgmd · a031b430

unknown authored Feb 14, 2007

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

a031b430

BUG#26352 unused ndb_mgm_rep_command in mgmapi.cpp · 22d157e4
unknown authored Feb 14, 2007
```
ndb/src/mgmapi/mgmapi.cpp:
  remove ndb_mgm_rep_command function
```
22d157e4

WL#3704 mgmapi timeouts (and cleanups) · 7fd6bbce

unknown authored Feb 14, 2007

indicate units in SocketOutputStream timeout

rename timeout in SocketOutputStream to reflect units (ms)

In 5.0 as well as is safe cleanup patch that will help with merging.


ndb/include/util/OutputStream.hpp:
  rename timeout in SocketOutputStream to reflect units (ms)
ndb/src/common/util/OutputStream.cpp:
  rename timeout in SocketOutputStream to reflect units (ms)

7fd6bbce

09 Feb, 2007 7 commits

Enabled engine_condition_pushdown (on) as default · f11f6836
unknown authored Feb 09, 2007

f11f6836
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · a10fa148
unknown authored Feb 09, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
a10fa148

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 205b9cbf

unknown authored Feb 09, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

205b9cbf

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 4de01438

unknown authored Feb 09, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

4de01438

bug #26225 Engine condition pushdown doesn't work with prepare statements... · ef60c96f

unknown authored Feb 09, 2007

bug #26225  Engine condition pushdown doesn't work with prepare statements (ps_7ndb): ensure that query plan for prepared statement is analyzed correctly

ef60c96f

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb · f9616d92

unknown authored Feb 09, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  manual merge
storage/ndb/src/common/debugger/EventLogger.cpp:
  masnual merge

f9616d92

BUG#22025 Return correct error message when transporter error occur. · a3dc06a8
unknown authored Feb 09, 2007
```
ndb/src/common/debugger/EventLogger.cpp:
  Add correct error string when transporter error occur.
```
a3dc06a8

08 Feb, 2007 1 commit
- Bug #24000 ndb_config.cpp has the wrong name ndb_condig.cpp in source distro · 6757caaa
  unknown authored Feb 08, 2007
```
storage/ndb/tools/ndb_config.cpp:
  Rename: storage/ndb/tools/ndb_condig.cpp -> storage/ndb/tools/ndb_config.cpp
```
  6757caaa
07 Feb, 2007 15 commits

ndb: correction of "ignore error" patch · 479ad12a
unknown authored Feb 08, 2007

479ad12a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1daa0e44
unknown authored Feb 08, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
1daa0e44
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · a11fb9eb
unknown authored Feb 07, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
a11fb9eb

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 7d678ab9

unknown authored Feb 07, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

7d678ab9

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 45203857
unknown authored Feb 07, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
45203857

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · e7c4bc62

unknown authored Feb 07, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

e7c4bc62

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 0690e39b

unknown authored Feb 07, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
sql/ha_ndbcluster.h:
  SCCS merged

0690e39b

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 384c1304
unknown authored Feb 07, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
384c1304

NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc: · c8f470ea

unknown authored Feb 07, 2007

bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
Removed stray mthod declaration

sql/ha_ndbcluster.h:
Removed stray mthod declaration
ndb/include/ndbapi/NdbScanOperation.hpp:
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ndb/src/ndbapi/NdbScanOperation.cpp:
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
sql/ha_ndbcluster.cc:
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound

c8f470ea

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · f1882c1f
unknown authored Feb 07, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
f1882c1f
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 5d00f961
unknown authored Feb 07, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
5d00f961
bug#25821 Excessive partition pruning for multi-range index scan in NDB API:... · 310d70a3
unknown authored Feb 07, 2007
```
bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added original test case
```
310d70a3
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 6e393bdb
unknown authored Feb 07, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
6e393bdb

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 17f82aa3

unknown authored Feb 07, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged

17f82aa3

bug#25821 Excessive partition pruning for multi-range index scan in NDB API:... · f3463a8c
unknown authored Feb 07, 2007
```
bug#25821  Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value
```
f3463a8c

06 Feb, 2007 8 commits

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · cef338ec

unknown authored Feb 06, 2007

into  mysql.com:/windows/Linux_space/MySQL/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.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

cef338ec

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · fd2c17db

unknown authored Feb 06, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  SCCS merged

fd2c17db

Fix for bug#25821 Excessive partition pruning for multi-range index scan in... · ba8a684d

unknown authored Feb 06, 2007

Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range

ba8a684d

Excluded wrongly merged changeset. · efc2771d
unknown authored Feb 07, 2007

efc2771d

Bug#26015 valgrind warning PollGuard::unlock_and_signal()/NdbCondition_Destroy · b2f415d3

unknown authored Feb 06, 2007

- Add variable "ndbcluster_binlog_terminating" and use that to signal
the cluster binlog thread it's time to shutdown. This allows
exact control of when the thread shutdown, previous implementation 
would start shutdown of the thread as soon as the mysqld started
shutdown. Now we will shutdown cluster binlog thread 
in 'ndbcluster_binlog_end'


sql/ha_ndbcluster_binlog.cc:
  Make binlog thread shutdown controllable by using a separet variable
  to communicate the order to shutdown

b2f415d3

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga · bc365a8b

unknown authored Feb 06, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged

bc365a8b

ndb: only inject events (ACTIVE, NODE_FAILURE, CLUSTER_FAILURE) if bit shows connected · 87684824
unknown authored Feb 06, 2007

87684824
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 95edb7dd
unknown authored Feb 06, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
95edb7dd