Commits · 8b46825627808a4e6bfba09565a08f5f03d95421 · Kirill Smelkov / mariadb

13 Mar, 2007 2 commits

BUG#25880, Adding new column to ndb_dd table moves data for non_indexed fields in memory · 8b468256

unknown authored Mar 13, 2007

correct the inconsistency between columns' storage type with table's storage_media & tablespace


sql/ha_ndbcluster.cc:
  move something to proper location, 
  then columns' storage type are consistent with table's storage_media & tablespace

8b468256

Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj · 34099021
unknown authored Mar 13, 2007
```
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug26307
```
34099021

09 Mar, 2007 1 commit
- Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj · 1fee5402
  unknown authored Mar 09, 2007
```
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug25992
```
  1fee5402
08 Mar, 2007 1 commit

BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), · 5e71938a

unknown authored Mar 08, 2007

          ndbd nodes are crashed


storage/ndb/src/kernel/vm/Pool.hpp:
  Only when m_pool.seize() return true, the ptr.i and ptr.p is assigned the right value, 
  or else the parameter ptr should be "not touched".

5e71938a

05 Mar, 2007 1 commit

BUG#25992 Data nodes died during creating many tables based on different tablespaces. · 81e15b49

unknown authored Mar 05, 2007

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Because TableSpaces, Datafiles, Undofiles and LogfileGroups uses the same id-space with Tables,
when they are created, the objId allocated for TableSpaces, Datafiles, Undofiles and LogfileGroups
shouldn't satisfy the rule of (tableId < c_tableRecordPool.getSize()).

81e15b49

02 Mar, 2007 5 commits

BUG#26307 correct inconsistant jam() and ljam() use in DBTUP source files. · 2c27d1a3

unknown authored Mar 02, 2007


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  redefine jam and jamEntry and change offset ranges of source files
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  redefine jam and jamEntry
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  redefine jam and jamEntry

2c27d1a3

Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj · dec21095
unknown authored Mar 02, 2007
```
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug19378
```
dec21095

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug19378 · b69c37b3

unknown authored Mar 02, 2007

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug19378


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

b69c37b3

bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected · 7ee5cfd0

unknown authored Mar 02, 2007

when merge from 5.0 to 5.1, update a function call in testScanFilter.cpp 
beacuase the function's definition is changed from 5.0 to 5.1


storage/ndb/test/ndbapi/testScanFilter.cpp:
  bug#24568
  it need change f() call because NDBT_CreateTableHook definition is changed from 5.0 to 5.1

7ee5cfd0

bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected, · 38f9206a

unknown authored Mar 02, 2007

add a new file in 5.0 and rename it in 5.1 because the directory of ndb is changed from 5.0 to 5.1

storage/ndb/test/ndbapi/testScanFilter.cpp:
Rename: ndb/test/ndbapi/testScanFilter.cpp -> storage/ndb/test/ndbapi/testScanFilter.cpp

38f9206a

01 Mar, 2007 2 commits

Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug24568-5.0-ndb-bj · e8caf0c7

unknown authored Mar 01, 2007

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24568-5.1-new-ndb-bj


storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  SCCS merged

e8caf0c7

correct NAND/NOR scan operations, and add a test case for it. · 3a6ee28e

unknown authored Mar 01, 2007


ndb/src/ndbapi/NdbScanFilter.cpp:
  translate NAND/NOR into AND/OR, since AND/OR operations are all correct
ndb/test/include/NDBT_Test.hpp:
  add a new method executeOneCtx() in class NDBT_TestSuite, declare it
ndb/test/ndbapi/Makefile.am:
  Add a new test case: testScanFIlter.cpp to test/ndbapi/,
  thus modify the Makefile.am related to it
ndb/test/src/NDBT_Test.cpp:
  add a new method in class NDBT_TestSuite in order to adapt to 
  some customized test cases, because the default NDBT's test talbes
  and flow are fixed, if just modify related existing methods, it will
  influence other test cases in test/ndbapi/
ndb/test/ndbapi/testScanFilter.cpp:
  It's a test case for ndbapi scan filter, test for AND/OR/NAND/NOR scan operations.

3a6ee28e

15 Feb, 2007 8 commits

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj · 5ea89ad3
unknown authored Feb 15, 2007
```
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug19378


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
```
5ea89ad3

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · e716434c

unknown authored Feb 15, 2007

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug19378


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

e716434c

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug19378 · 8af0f416

unknown authored Feb 15, 2007

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug19378


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

8af0f416

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug21715 · d10a21e8

unknown authored Feb 15, 2007

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21715


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

d10a21e8

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-bug21715 · 157ee7e6

unknown authored Feb 15, 2007

into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug21715

ndb/src/mgmclient/CommandInterpreter.cpp:
Adding 'version' variable assigns the right value to prevent from the version(0.0.0.0) status

157ee7e6

BUG#21715 mgm client command <id> status return version(0.0.0.0) · 35f79a6f

unknown authored Feb 15, 2007

ndb/src/mgmclient/CommandInterpreter.cpp:
Adding the judgement for node type to distinguish the data nodes and non-data nodes.
From the return value. Management client can't distinguish the really not connected
status for data nodes and status of non-data nodes.
We can get the connect status about non-data nodes from version, if the version is 0,
it means no connected status.

35f79a6f

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb · c72d0972

unknown authored Feb 15, 2007

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj


storage/ndb/tools/restore/consumer.hpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

c72d0972

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · 7715c4a2

unknown authored Feb 15, 2007

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug24363


storage/ndb/tools/restore/consumer.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.hpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

7715c4a2

12 Feb, 2007 1 commit

BUG#19378 Job Buffer Full error appears for too large MaxNoOfTables · ab45dc80

unknown authored Feb 12, 2007


ndb/src/mgmsrv/ConfigInfo.cpp:
  The high bound of MaxNoOfTables changes into MAX_TABLES defined in ndb_limits.h

ab45dc80

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 11 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