summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql.result
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2009-05-28 13:40:09 +0500
committerSergey Glukhov <Sergey.Glukhov@sun.com>2009-05-28 13:40:09 +0500
commit0aa26d39aa7743162a6fe3246369b10729178eab (patch)
tree075b2f57a985b23448475d0bc89bbe4735a61654 /mysql-test/r/mysql.result
parent6282b4d3e4133c355e45e63e97fe5b6649133f53 (diff)
parent1b91400ac6758e3ce28a4ee18123a5c5117c9f7e (diff)
downloadmariadb-git-0aa26d39aa7743162a6fe3246369b10729178eab.tar.gz
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'mysql-test/r/mysql.result')
-rw-r--r--mysql-test/r/mysql.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index a04eb1ca1aa..6313f1bd6a8 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -198,6 +198,7 @@ COUNT (*)
1
COUNT (*)
1
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (1)
End of 5.0 tests
WARNING: --server-arg option not supported in this configuration.
Warning (Code 1286): Unknown table engine 'nonexistent'