diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-12 12:51:53 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-12 12:51:53 +0300 |
| commit | 4db97ede5b1dacbd03a5590b38370b64e55127c3 (patch) | |
| tree | 1d8062b6d5a8ab72361ee3021277a00ca8c6acf1 /mysql-test/std_data | |
| parent | d2452095a5526d219056ba623960bf3a39c3f566 (diff) | |
| parent | cbfdc588e9f5602045e0c016fb30b641e87bf406 (diff) | |
| download | mariadb-git-4db97ede5b1dacbd03a5590b38370b64e55127c3.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/subselect.result
Text conflict in mysql-test/r/subselect3.result
Text conflict in mysql-test/r/type_datetime.result
Text conflict in sql/share/Makefile.am
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/bug48265.frm | bin | 0 -> 8554 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/std_data/bug48265.frm b/mysql-test/std_data/bug48265.frm Binary files differnew file mode 100644 index 00000000000..0a731964996 --- /dev/null +++ b/mysql-test/std_data/bug48265.frm |