summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql.result
diff options
context:
space:
mode:
authorChad MILLER <chad@mysql.com>2008-12-11 12:46:20 -0500
committerChad MILLER <chad@mysql.com>2008-12-11 12:46:20 -0500
commita633e0b98d0dbd5aab04901856dfd717b916a508 (patch)
tree186a712bab08112017b7d95af55abc0a8847fea6 /mysql-test/r/mysql.result
parent32c1790ba873d528e36b3b6bef34cc7c0cf20362 (diff)
parentd84690c92d165e0335da16a7e95b10ac5684420e (diff)
downloadmariadb-git-a633e0b98d0dbd5aab04901856dfd717b916a508.tar.gz
Merge fix for Bug 33812 from 5.0-bugteam.
Diffstat (limited to 'mysql-test/r/mysql.result')
-rw-r--r--mysql-test/r/mysql.result6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index a4d96c1c243..65f163a7acc 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -180,6 +180,12 @@ ERROR at line 1: DELIMITER cannot contain a backslash character
1
This is a file starting with UTF8 BOM 0xEFBBBF
This is a file starting with UTF8 BOM 0xEFBBBF
+delimiter
+1
+2
+2
+2
+2
End of 5.0 tests
WARNING: --server-arg option not supported in this configuration.
Warning (Code 1286): Unknown table engine 'nonexistent'