summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql.result
diff options
context:
space:
mode:
authorJim Winstead <jimw@mysql.com>2009-05-13 08:48:00 -0700
committerJim Winstead <jimw@mysql.com>2009-05-13 08:48:00 -0700
commit4161dc49b3a8e0281f70e0362098c16fe291720d (patch)
treec861b8090364d511ed5eec125964d3df9123cedd /mysql-test/r/mysql.result
parent10611fe61bbfafbeee96915a8ddaaf555ff36e28 (diff)
parentc65ebb5d137431b7b42636c3d7aa55132a42255e (diff)
downloadmariadb-git-4161dc49b3a8e0281f70e0362098c16fe291720d.tar.gz
Merge 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 c53a2243811..a04eb1ca1aa 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -192,6 +192,12 @@ delimiter
1
1
1
+COUNT (*)
+1
+COUNT (*)
+1
+COUNT (*)
+1
End of 5.0 tests
WARNING: --server-arg option not supported in this configuration.
Warning (Code 1286): Unknown table engine 'nonexistent'