summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mysql.com>2009-12-22 12:02:52 +0100
committerSergei Golubchik <serg@mysql.com>2009-12-22 12:02:52 +0100
commitbb865442a4282b1146fd693dac18d98d55d888d2 (patch)
treeb0ff6d1e872359523d369f89295856c28e157cc4 /mysql-test/r/mysql.result
parent1ad5bb1a69656808312efc40ca12c4897f8ea128 (diff)
downloadmariadb-git-bb865442a4282b1146fd693dac18d98d55d888d2.tar.gz
minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase better
Diffstat (limited to 'mysql-test/r/mysql.result')
-rw-r--r--mysql-test/r/mysql.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index 366052af95e..b2d4531d0ad 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;