Commits · 9be64cebb292149c7741067f43882d7803be76aa · nexedi / MariaDB

29 Jun, 2006 1 commit
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 9be64ceb
  unknown authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  9be64ceb
28 Jun, 2006 18 commits

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


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

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

e36f114c

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 4f58f189
unknown authored Jun 28, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
4f58f189
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 888b8e05
unknown authored Jun 28, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
888b8e05

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 4fe03aca

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

4fe03aca

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

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

f366fdca

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge · 9b101bcd

unknown authored Jun 28, 2006

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


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

9b101bcd

Merge mysql.com:/home/stewart/Documents/MySQL/4.1/merge · 78ba03d2

unknown authored Jun 28, 2006

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


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

78ba03d2

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

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

ba372daf

ndb - · 93b5dcdd

unknown authored Jun 28, 2006

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


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

93b5dcdd

ndb - · 46d4b345

unknown authored Jun 28, 2006

  ndbapi test of bug#20252


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

46d4b345

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

unknown authored Jun 28, 2006

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


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

1101d74c

ndb - bug#20442 · 70fa1747

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

70fa1747

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


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


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

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

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

9b27aa52

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

27 Jun, 2006 20 commits

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

54a05151

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5861497b

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

5861497b

partition functions to pass create_info, not only max_rows · 7641c7ae
unknown authored Jun 27, 2006

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

rpl_ndb_dd_partitions.test, rpl_ndb_dd_partitions.result: · 0e0316e9

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

0e0316e9

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

Many files: · 09442a55

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

09442a55

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

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

9392e53f

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

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

189eb7c9

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


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

eb0c6dda
Bug #19852 Restoring backup made from cluster with full data memory fails · d73dca8f
unknown authored Jun 27, 2006
```
- post merge fixes for 5.1
```
d73dca8f
Bug #19852 Restoring backup made from cluster with full data memory fails · 33616fb9
unknown authored Jun 27, 2006
```
- post merge fixes for 5.1
```
33616fb9

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

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

fc20916c

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

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

35e276c9

ndb - bug#20252 · 43de64db

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

43de64db

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main · 29a0ef46

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

29a0ef46

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

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main · 79c6d94f

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

79c6d94f

Bug #19852 Restoring backup made from cluster with full data memory fails · 6f0bbc51

unknown authored Jun 27, 2006

- make sure to allocate just enough pages in the fragments by using the actual
  row count from the backup, to avoid over allocation of pages to fragments, and
  thus avoid the bug


ndb/include/kernel/GlobalSignalNumbers.h:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - distribute fragment complete to all participants to update row count
ndb/include/kernel/signaldata/BackupContinueB.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - time slica writing of fragment info to ctl file
ndb/include/kernel/signaldata/BackupImpl.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - 32 -> 64 bit on bytes and records
  - new signal fragment complete to all participants
ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - 32 -> 64 bit on bytes and records
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - add min and max rows to dict tab info
ndb/include/kernel/signaldata/LqhFrag.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to add frag req
ndb/include/kernel/signaldata/TupFrag.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to add frag req
ndb/include/ndbapi/NdbDictionary.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added get/set of min max rows
ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - 32 -> 64 bit on bytes and records
ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - 32 -> 64 bit on bytes and records
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to dict tab info
ndb/src/common/debugger/signaldata/LqhFrag.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to frag req
ndb/src/kernel/blocks/backup/Backup.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - new section in backup with per fragment info in ctl file
  - 32 -> 64 bit on bytes and records
ndb/src/kernel/blocks/backup/Backup.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - new section in backup with per fragment info in ctl file
  - 32 -> 64 bit on bytes and records
ndb/src/kernel/blocks/backup/BackupFormat.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - new section in backup with per fragment info in ctl file
  - 32 -> 64 bit on bytes and records
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - new signal fragment complete to all participants
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added max and min rows to dict table object
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added max and min rows to dict table object
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to frag req
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to frag req
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to frag req
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to frag req
  - move memory allocation to fragment to after adding of attributes to get correct headsize
  - allocate pages to fragments according to min rows setting
ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - grow page allocation starting from 2 irrespective of first page allocation
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - 32 -> 64 bits on bytes and records
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - 32 -> 64 bits on bytes and records
ndb/src/ndbapi/NdbDictionary.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - min and max rows in dict
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - min and max rows in dict
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - min and max rows in dict
ndb/tools/restore/Restore.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - add retrieval of fragment info
ndb/tools/restore/Restore.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - add retrieval of fragment info
ndb/tools/restore/consumer_restore.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - set min in restore to the actual row count (this is the actual bug fix)
sql/ha_ndbcluster.cc:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - set min and max rows according to sql definition

6f0bbc51

26 Jun, 2006 1 commit

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 083ccc17

unknown authored Jun 27, 2006

into  mysql.com:/opt/local/work/mysql-5.1-runtime


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/events_stress.test:
  Auto merged

083ccc17