1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

5.0-bugteam->5.1-bugteam merge

Browse Source
This commit is contained in:
Sergey Glukhov 2009-05-28 16:21:41 +05:00
commit b4a725c4f3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/mysql.result
View File

@ -198,7 +198,7 @@ COUNT (*)
1 1
COUNT (*) COUNT (*)
1 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 End of 5.0 tests
WARNING: --server-arg option not supported in this configuration. WARNING: --server-arg option not supported in this configuration.
Warning (Code 1286): Unknown table engine 'nonexistent' Warning (Code 1286): Unknown table engine 'nonexistent'

1
mysql-test/t/mysql.test
View File

@ -352,6 +352,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql;
# #
# Bug#37268 'binary' character set makes CLI-internal commands case sensitive # Bug#37268 'binary' character set makes CLI-internal commands case sensitive
# #
--replace_regex /\([0-9]*\)/(errno)/
--error 1 --error 1
--exec $MYSQL --default-character-set=binary test -e "CONNECT test invalid_hostname" 2>&1 --exec $MYSQL --default-character-set=binary test -e "CONNECT test invalid_hostname" 2>&1
--exec $MYSQL --default-character-set=binary test -e "DELIMITER //" 2>&1 --exec $MYSQL --default-character-set=binary test -e "DELIMITER //" 2>&1