diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
| commit | 69cfd5c8ecd20bca0e651efcbb8b5affc24c1af4 (patch) | |
| tree | 965519a5b0af3f33624c7e16fd61b58d15f42372 /mysql-test/r/innodb_bug34300.result | |
| parent | 713ed2d2438dd0e5aecf8ea5138d0ca97c3bc519 (diff) | |
| parent | 2757eab5444982e9375f77d9bca52992f55cc565 (diff) | |
| download | mariadb-git-69cfd5c8ecd20bca0e651efcbb8b5affc24c1af4.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- client/mysqltest.cc
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/t/disabled.def
- sql/mysqld.cc
- sql/opt_range.cc
- sql/sp.cc
- sql/sql_acl.cc
- sql/sql_partition.cc
- sql/sql_table.cc
Diffstat (limited to 'mysql-test/r/innodb_bug34300.result')
0 files changed, 0 insertions, 0 deletions