Commits · ed52ee884c80b4a5706b8d8571e87aaf0f4a16b9 · nexedi / MariaDB

14 Feb, 2007 8 commits

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

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

ed52ee88

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

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)

b9b2b083

BUG#26357 remove unused GSN_STATISTICS_REQ and CONF · 63e75ad9

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

63e75ad9

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

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.

b944b351

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

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

2aa52f6b

BUG#26353 remove GET_CONFIG_BACKWARDS_COMPAT from ndb_mgmd · 53eecff3

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

53eecff3

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

WL#3704 mgmapi timeouts (and cleanups) · 55516ba5

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)

55516ba5

09 Feb, 2007 7 commits

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

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


sql/ha_ndbcluster.cc:
  Auto merged
```
1c6d127a

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

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

17af7c07

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

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

f3e1ecc7

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

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

67cd2789

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

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

ad933942

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

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

ndb: correction of "ignore error" patch · 10db7275
unknown authored Feb 08, 2007

10db7275
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 485f35eb
unknown authored Feb 08, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb


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

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

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

de1eced0

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

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

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

bbbd87cf

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

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

9ae03424

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

NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc: · 9656559a

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

9656559a

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · ea48fec4
unknown authored Feb 07, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
ea48fec4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 9fa11535
unknown authored Feb 07, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
9fa11535
bug#25821 Excessive partition pruning for multi-range index scan in NDB API:... · 7709f3b8
unknown authored Feb 07, 2007
```
bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added original test case
```
7709f3b8
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · a3cc5dc5
unknown authored Feb 07, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
a3cc5dc5

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

unknown authored Feb 07, 2007

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


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

7042b524

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

06 Feb, 2007 9 commits

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

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

3b64cbb6

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

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

b7b6961f

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

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

8e60d0b0

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

df95907a

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

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

50594204

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

unknown authored Feb 06, 2007

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


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

a4251002

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

03eb68ac
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 87ca5918
unknown authored Feb 06, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
87ca5918

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

unknown authored Feb 06, 2007

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


sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge

4161120f