Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

Browse Source

Conflicts:

Text conflict in mysql-test/r/partition.result
Text conflict in mysql-test/t/partition.test
Text conflict in storage/myisam/mi_dynrec.c

...

This commit is contained in:

Alexey Kopytov

2010-04-03 12:37:53 +04:00

parent 5a59d706be 3569fe776f

commit 3678231d5a

13 changed files with 110 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

mysql-test/std_data/bug46565.ARZ Normal file

Binary file not shown.

BIN

mysql-test/std_data/bug46565.frm Normal file

Binary file not shown.