summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql.result
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-01-09 19:51:52 +0200
committerGeorgi Kodinov <joro@sun.com>2009-01-09 19:51:52 +0200
commitd09185fafa598e87eb6015d8132435d0611155b0 (patch)
treec7444917cfc9a7604c26bbf32e139ef2d415d9df /mysql-test/r/mysql.result
parentfffe666f6d453460b88607e1a99749f9d1647a8d (diff)
parentaf0e03b2622f2213d512bf5e11aecaaf401531fb (diff)
downloadmariadb-git-d09185fafa598e87eb6015d8132435d0611155b0.tar.gz
merged 41437 to 5.1-bugteam
Diffstat (limited to 'mysql-test/r/mysql.result')
-rw-r--r--mysql-test/r/mysql.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index 65f163a7acc..25b66fe7fc6 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -186,6 +186,8 @@ delimiter
2
2
2
+@z:='1' @z=database()
+1 NULL
End of 5.0 tests
WARNING: --server-arg option not supported in this configuration.
Warning (Code 1286): Unknown table engine 'nonexistent'