Commits · 592c0059584a94430cae78cc5ffeb7f45b9f755a · nexedi / MariaDB

29 Jun, 2006 1 commit

Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516). · 592c0059

unknown authored Jun 29, 2006


BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
scripts/Makefile.am:
  Manual merge: "ul" (the shell script is already deleted in 5.1)

592c0059

28 Jun, 2006 5 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

Manual merge · a6807551

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

Manual merge for bug#20216. · b024b6c0

unknown authored Jun 27, 2006


support-files/mysql.spec.sh:
  Manual merge for bug#20216, due to some conflict in the changenotes.

b024b6c0

Revert all previous attempts to call "mysql_upgrade" during RPM upgrade. · 0604daa4

unknown authored Jun 27, 2006

This finishes bug#18516, as far as "generic RPMs" are concerned.

support-files/mysql.spec.sh:
Revert all previous attempts to call "mysql_upgrade" during RPM upgrade,
there are some more aspects which need to be solved before this is possible.
For now, just ensure the binary "mysql_upgrade" is delivered and installed.
This finishes bug#18516, as far as "generic RPMs" are concerned.

0604daa4

Merge mysql.com:/M50/bug19353-5.0-2 into mysql.com:/M50/bug20216-5.0 · 0b6de748
unknown authored Jun 27, 2006
```
support-files/mysql.spec.sh:
  Auto merged
```
0b6de748
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

Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216), · 30b1d658

unknown authored Jun 27, 2006

manual merge from 4.0.


support-files/mysql.spec.sh:
  Manual merge of the fix for bug#20216.
  (became necessary because 4.0 and 4.1 spec files use different file sort order).

30b1d658

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

Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216). · d8e9dd61
unknown authored Jun 27, 2006

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

Bug #19852 Restoring backup made from cluster with full data memory fails · 0335013f

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

0335013f

26 Jun, 2006 12 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 57f3f256

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

57f3f256

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1 · 91efca68
unknown authored Jun 26, 2006
```
into  mysql.com:/data0/mysql-5.1
```
91efca68
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new · 98ba03d2
unknown authored Jun 26, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
98ba03d2

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 17f724a1

unknown authored Jun 26, 2006

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


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

17f724a1

Merge mysql.com:/opt/local/work/tmp_merge · 313b46a0

unknown authored Jun 26, 2006

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


mysql-test/r/sp-prelocking.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
mysql-test/t/sp-prelocking.test:
  Manual merge.

313b46a0

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

unknown authored Jun 26, 2006

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


mysql-test/r/information_schema.result:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/events.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/events_microsec.test:
  SCCS merged

fee803af

Merge mysql.com:/usr/local/mysql/mysql-5.1-pristine · 6d8c855a
unknown authored Jun 26, 2006
```
into  mysql.com:/usr/local/mysql/tmp-5.1
```
6d8c855a

BUG#20676: debug warnings about too many lock waiters cause test failure. · 1ef08c91

unknown authored Jun 26, 2006

The 250 simultaneous events all accessing the same table caused the
events_stress test to fail due to debug warnings about too many table
waiters. Fixed by using three different tables.


mysql-test/r/events_stress.result:
  Use three different MyISAM tables to avoid debug warnings about too many
  locks.
mysql-test/t/events_stress.test:
  Use three different MyISAM tables to avoid debug warnings about too many
  locks.

1ef08c91

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 42169376

unknown authored Jun 26, 2006

into lmy004.:/work/mysql-5.1-runtime-bug16992


mysql-test/t/events.test:
  Auto merged
mysql-test/t/events_grant.test:
  Auto merged
sql/sql_show.cc:
  Auto merged

42169376

Merge mysql.com:/usr/local/mysql/mysql-5.1-bug20549 · a5e194ed

unknown authored Jun 26, 2006

into  mysql.com:/usr/local/mysql/tmp-5.1


sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

a5e194ed

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new · 9fe96d8f

unknown authored Jun 26, 2006

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

9fe96d8f

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · c945766f

unknown authored Jun 26, 2006

into lmy004.:/work/mysql-5.1-runtime-bug18897


mysql-test/t/events_bugs.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

c945766f

25 Jun, 2006 1 commit

Post merge fix · 725ab9df

unknown authored Jun 25, 2006


mysql-test/r/func_time.result:
  post-merge fix
mysql-test/r/select.result:
  post-merge fix

725ab9df