summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql.result
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2009-05-28 16:21:41 +0500
committerSergey Glukhov <Sergey.Glukhov@sun.com>2009-05-28 16:21:41 +0500
commitb4a725c4f3dd1f06a366000202a91bdc1b301a04 (patch)
tree05d6e88e6968f097551e4c1ee0f620d7a657e0fd /mysql-test/r/mysql.result
parent0aa26d39aa7743162a6fe3246369b10729178eab (diff)
parent4cfc9d771a606117f37e543c1a117887cc58ec40 (diff)
downloadmariadb-git-b4a725c4f3dd1f06a366000202a91bdc1b301a04.tar.gz
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'mysql-test/r/mysql.result')
-rw-r--r--mysql-test/r/mysql.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index 6313f1bd6a8..e704f81e187 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -198,7 +198,7 @@ COUNT (*)
1
COUNT (*)
1
-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (1)
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
End of 5.0 tests
WARNING: --server-arg option not supported in this configuration.
Warning (Code 1286): Unknown table engine 'nonexistent'