Commits · a671205a9414a2d9036d8704ac11763b757c4d11 · nexedi / MariaDB

13 Mar, 2007 2 commits
- Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · a671205a
  unknown authored Mar 13, 2007
```
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25877-5.1-new-ndb-bj
```
  a671205a
- Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj · cc728f4a
  unknown authored Mar 13, 2007
```
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug26307
```
  cc728f4a
09 Mar, 2007 1 commit
- Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj · 6e10191c
  unknown authored Mar 09, 2007
```
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug25992
```
  6e10191c
08 Mar, 2007 1 commit

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

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".

722a17d9

05 Mar, 2007 2 commits

BUG#25877, After DROP INDEX non-indexed data isn't moved from memory into tablespace · f31e1872

unknown authored Mar 05, 2007


sql/ha_ndbcluster.cc:
  add/drop index online will change storage media type, 
  so add storage type check in check_if_incompatible_data(),
  when storage type is changed, will create a new table,
  then this can correct the column and table's storage type.

f31e1872

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

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()).

2a7ec856

02 Mar, 2007 5 commits

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

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

392ee6e9

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

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

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

958240aa

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

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

d15e829e

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

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

a075a7c7

01 Mar, 2007 2 commits

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

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

fd49d69f

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

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.

488b904a

15 Feb, 2007 8 commits

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj · 8978c59a
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
```
8978c59a

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

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

44031c9c

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

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

3ee759c6

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

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

1a1b65f3

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

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

2409ce0e

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

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.

529d9fb9

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

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

e45e29b3

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

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

1bc1a263

12 Feb, 2007 1 commit

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

unknown authored Feb 12, 2007


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

e4222173

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