diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-18 23:19:19 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-18 23:19:19 +0300 |
| commit | 40271e4f5edacc6fe90ed74a087e5ff25daea899 (patch) | |
| tree | d38210df12297fa40d9edbf59cbb72329a4ccad4 /mysql-test/r/mysql.result | |
| parent | 0ae23cd69d3c13dba2a73750e93abf3342f21eb4 (diff) | |
| parent | 33c075e842324cfdf0aab055c2db8d0d50bcbc68 (diff) | |
| download | mariadb-git-40271e4f5edacc6fe90ed74a087e5ff25daea899.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sql_plugin.cc
Diffstat (limited to 'mysql-test/r/mysql.result')
| -rw-r--r-- | mysql-test/r/mysql.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index b50fcb35ee3..3c53faff526 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -397,9 +397,9 @@ WARNING: --server-arg option not supported in this configuration. +---+ | 1 | +---+ -Warning (Code 1286): Unknown table engine 'nonexistent' +Warning (Code 1286): Unknown storage engine 'nonexistent' Warning (Code 1266): Using storage engine MyISAM for table 't2' -Warning (Code 1286): Unknown table engine 'nonexistent2' +Warning (Code 1286): Unknown storage engine 'nonexistent2' Warning (Code 1266): Using storage engine MyISAM for table 't2' Error (Code 1050): Table 't2' already exists drop tables t1, t2; |