summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql.result
diff options
context:
space:
mode:
authorGeorgi Kodinov <kgeorge@mysql.com>2009-02-25 11:09:41 +0200
committerGeorgi Kodinov <kgeorge@mysql.com>2009-02-25 11:09:41 +0200
commitdc69c3439fa2e657fc1fb9c56c0e2dbfe7a8bc89 (patch)
tree2f512709d536402bd08a4a5be7b918069a3088ac /mysql-test/r/mysql.result
parent19ee83f02e2948252be6fb3701c7d19393f121a5 (diff)
parent85ea3740ffa44454d7d3cb03f90857bfa43d2aad (diff)
downloadmariadb-git-dc69c3439fa2e657fc1fb9c56c0e2dbfe7a8bc89.tar.gz
merged bug 31060 to 5.1-bugteam
Diffstat (limited to 'mysql-test/r/mysql.result')
-rw-r--r--mysql-test/r/mysql.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index 25b66fe7fc6..5054c3aa76f 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -188,6 +188,10 @@ delimiter
2
@z:='1' @z=database()
1 NULL
+1
+1
+1
+1
End of 5.0 tests
WARNING: --server-arg option not supported in this configuration.
Warning (Code 1286): Unknown table engine 'nonexistent'