Commits · 3298faa1458280a130cf86072d8ba1f62057acd2 · Kirill Smelkov / mariadb

29 Jun, 2006 3 commits
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 3298faa1
  unknown authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  manual merge
```
  3298faa1
- fixed too small requestInfo in signal · 78c81415
  unknown authored Jun 29, 2006
```
+ adopted signal to be as close as possible to 5.1...
```
  78c81415
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 9acfd21f
  unknown authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  9acfd21f
28 Jun, 2006 18 commits

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 · fa99e347
unknown authored Jun 28, 2006
```
into moonbone.local:/home/evgen/mysql-5.1-new
```
fa99e347
Merge xiphis.org:/home/antony/work2/p4-bug12096.3 · a5464fe5
unknown authored Jun 28, 2006
```
into  xiphis.org:/home/antony/work2/p4-bug12096.3-merge


sql/mysqld.cc:
  Auto merged
```
a5464fe5

unknown authored Jun 28, 2006


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

a6807551

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 39e9830f
unknown authored Jun 28, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
39e9830f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 523a8c0c
unknown authored Jun 28, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
523a8c0c

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 9607b202

unknown authored Jun 28, 2006

into  mysql.com:/home/stewart/Documents/MySQL/5.1/bug20725


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

9607b202

Merge mysql.com:/home/stewart/Documents/MySQL/5.1/ndb · 842ae81d

unknown authored Jun 28, 2006

into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

842ae81d

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge · 7273e37d

unknown authored Jun 28, 2006

into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge


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

7273e37d

Merge mysql.com:/home/stewart/Documents/MySQL/4.1/merge · 3e8cba8b

unknown authored Jun 28, 2006

into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge


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

3e8cba8b

BUG#19894 Data nodes fail during loading data if NoOfFragmentLogFiles=1 · a0837ece

unknown authored Jun 28, 2006

change default minimum to 3

bug is *very* timing dependent, unable to reproduce here, but theoretically possible.


ndb/src/mgmsrv/ConfigInfo.cpp:
  change minimum NoOfFragmentLogFiles to 3

a0837ece

ndb - · 42f61262

unknown authored Jun 28, 2006

  50->51 merge of bug#20442, force close scan (with locks)


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  merge

42f61262

ndb - · 52c32382

unknown authored Jun 28, 2006

  ndbapi test of bug#20252


storage/ndb/test/ndbapi/testScan.cpp:
  ndbapi test of bug#20252

52c32382

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 7e39d48e

unknown authored Jun 28, 2006

into  perch.ndb.mysql.com:/home/jonas/src/51-work


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

7e39d48e

ndb - bug#20442 · d7534c3a

unknown authored Jun 28, 2006

  force close of scan (of outstanding scan_frag)


ndb/src/ndbapi/NdbScanOperation.cpp:
  Force close of scan in when not doing committed read scan

d7534c3a

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug11459 · 98afd8b5
unknown authored Jun 28, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge


sql/ha_ndbcluster.cc:
  Auto merged
```
98afd8b5
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · e2bf3f03
unknown authored Jun 28, 2006
```
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt


sql/sql_partition.cc:
  Auto merged
```
e2bf3f03

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · aef2cdd2

unknown authored Jun 28, 2006

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  SCCS merged

aef2cdd2

Bug #20705 table truncation from one mysqld causes ERROR 1412 on other mysqld servers · 0ec6bb3f
unknown authored Jun 28, 2006
```
- make sure to invalidate even if table is not binlogged
```
0ec6bb3f

27 Jun, 2006 19 commits

corrected partition test case results that were put back · 24cb5235
unknown authored Jun 28, 2006

24cb5235

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 85a6c26c

unknown authored Jun 27, 2006

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

85a6c26c

partition functions to pass create_info, not only max_rows · 62722a4d
unknown authored Jun 27, 2006

62722a4d
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · bc9d94cb
unknown authored Jun 27, 2006
```
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
```
bc9d94cb

rpl_ndb_dd_partitions.test, rpl_ndb_dd_partitions.result: · ea7f1a61

unknown authored Jun 27, 2006

  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
  new file


mysql-test/r/rpl_ndb_dd_partitions.result:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
mysql-test/t/rpl_ndb_dd_partitions.test:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin

ea7f1a61

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1 · eb8c3ade
unknown authored Jun 27, 2006
```
into  mysql.com:/data0/mysql-5.1
```
eb8c3ade

Many files: · cea60fb1

unknown authored Jun 27, 2006

  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
  new file


mysql-test/t/ndb_partition_error.test:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
mysql-test/t/ndb_partition_key.test:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
mysql-test/t/ndb_partition_list.test:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
mysql-test/t/ndb_partition_range.test:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
mysql-test/t/ndb_blob_partition.test:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
mysql-test/t/ndb_dd_backuprestore.test:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
mysql-test/r/ndb_partition_error.result:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
mysql-test/r/ndb_partition_key.result:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
mysql-test/r/ndb_partition_list.result:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
mysql-test/r/ndb_partition_range.result:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
mysql-test/r/ndb_blob_partition.result:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
mysql-test/r/ndb_dd_backuprestore.result:
  Adding back ndb partition tests from mysql-test-extra per tomas and clavin

cea60fb1

BUG#20725 MySQLD cluster use "fast count" is broken · da81451d

unknown authored Jun 28, 2006

fix based on review by tomas.

conform to bug we haven't fixed yet.


sql/ha_ndbcluster.cc:
  return -1 on error in ::records().
  
  produces a compiler warning, a bug and is evil.
  
  however, until we go and really fix the bug properly, it's best to conform

da81451d

BUG#20725 MySQLD cluster use "fast count" is broken · 95126295

unknown authored Jun 28, 2006

Post recent handler changes, fast count(*) for cluster was broken.

Seeing as we maintain an exact count for ndb, we can easily use this for an optimisation.

With this patch, and use_exact_count DISABLED, we will use the fast way
of getting count(*) but not use the exact count for the optimiser.

With this patch and use_exact_count ENABLED, we will use the fast way of
getting count(*) and use the exact count for the optimiser.


sql/ha_ndbcluster.cc:
  Implement handler::records() and set appropriate handler flag.
sql/ha_ndbcluster.h:
  we implment handler::records() for fast count(*)

95126295

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · bddaa6f2
unknown authored Jun 27, 2006
```
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt


sql/sql_db.cc:
  Auto merged
```
bddaa6f2
changed signature of get_default_no_partitions · d4cb502c
unknown authored Jun 27, 2006

d4cb502c
Bug #19852 Restoring backup made from cluster with full data memory fails · 39fa14dd
unknown authored Jun 27, 2006
```
- post merge fixes for 5.1
```
39fa14dd
Bug #19852 Restoring backup made from cluster with full data memory fails · da70a12c
unknown authored Jun 27, 2006
```
- post merge fixes for 5.1
```
da70a12c

Merge mysql.com:/home/hf/work/mysql-5.0.19672 · 7ad755e7

unknown authored Jun 27, 2006

into mysql.com:/home/hf/work/mysql-5.1.clean


mysys/my_init.c:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

7ad755e7

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · a0630577

unknown authored Jun 27, 2006

into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbReceiver.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  merge

a0630577

ndb - bug#20252 · f1056028

unknown authored Jun 27, 2006

  allow user to specify scan batch size in readTuples


ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Allow user to specify batch size
ndb/include/ndbapi/NdbScanOperation.hpp:
  Allow user to specify batch size
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix so that last row works even if batch is complete
ndb/src/ndbapi/NdbReceiver.cpp:
  Allow user yo specify batch size
ndb/src/ndbapi/NdbScanOperation.cpp:
  Allow user to specify batchsize

f1056028

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main · 89dbf165

unknown authored Jun 27, 2006

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


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  manual merge

89dbf165

Bug #19852 Restoring backup made from cluster with full data memory fails · d2da3c96
unknown authored Jun 27, 2006
```
- correction of previous patch
```
d2da3c96

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main · 6848be9c

unknown authored Jun 27, 2006

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


mysql-test/mysql-test-run.sh:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  manual merge
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  manual merge
storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  manual merge
storage/ndb/include/kernel/signaldata/TupFrag.hpp:
  manual merge
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  manual merge
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  manual merge
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  manual merge
storage/ndb/tools/restore/Restore.cpp:
  manual merge
storage/ndb/tools/restore/Restore.hpp:
  manual merge
storage/ndb/tools/restore/consumer_restore.cpp:
  manual merge

6848be9c