diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-03 12:37:53 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-03 12:37:53 +0400 |
| commit | 3678231d5a57e9d36056b75cc29023a376a3cb75 (patch) | |
| tree | 2e84ff7f9e6dcd233caa9e22272a48ae20c5209a /mysql-test/std_data | |
| parent | 5a59d706be5f38768fc861388d92c0f985a5fa1a (diff) | |
| parent | 3569fe776fbaf0a750b054b0684d37d7cefeaa94 (diff) | |
| download | mariadb-git-3678231d5a57e9d36056b75cc29023a376a3cb75.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
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
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/bug46565.ARZ | bin | 0 -> 8670 bytes |
| -rw-r--r-- | mysql-test/std_data/bug46565.frm | bin | 0 -> 8554 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/std_data/bug46565.ARZ b/mysql-test/std_data/bug46565.ARZ Binary files differnew file mode 100644 index 00000000000..f26b31218a1 --- /dev/null +++ b/mysql-test/std_data/bug46565.ARZ diff --git a/mysql-test/std_data/bug46565.frm b/mysql-test/std_data/bug46565.frm Binary files differnew file mode 100644 index 00000000000..5c0180bdc1e --- /dev/null +++ b/mysql-test/std_data/bug46565.frm |