diff options
| author | Jim Winstead <jimw@mysql.com> | 2009-07-30 17:51:25 -0700 |
|---|---|---|
| committer | Jim Winstead <jimw@mysql.com> | 2009-07-30 17:51:25 -0700 |
| commit | a90bcde091c52cfe72ca3db35cbb08c4a8c1a14d (patch) | |
| tree | 5088e4bf133bb114b8dd8939b5bf0a35d9165c3f /mysql-test/r/mysql.result | |
| parent | 69a9d66730f8448d0057e98a65f3cf16ddaf3fc1 (diff) | |
| parent | c754b00a1f79d1ea78b1a2d2c51a1b2281500fff (diff) | |
| download | mariadb-git-a90bcde091c52cfe72ca3db35cbb08c4a8c1a14d.tar.gz | |
Merge bug fix.
Diffstat (limited to 'mysql-test/r/mysql.result')
| -rw-r--r-- | mysql-test/r/mysql.result | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index b77d30a4973..4384675152e 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -162,8 +162,8 @@ ERROR 1049 (42000) at line 1: Unknown database 'invalid' ERROR 1049 (42000) at line 1: Unknown database 'invalid' Test connect with dbname + hostname Test connect with dbname + _invalid_ hostname -ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno) -ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno) +ERROR 2003 (HY000) at line 1: Can't connect to MySQL server on 'invalid_hostname' (errno) +ERROR 2003 (HY000) at line 1: Can't connect to MySQL server on 'invalid_hostname' (errno) The commands reported in the bug report ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno) Too long dbname @@ -207,5 +207,27 @@ Warning (Code 1286): Unknown table engine 'nonexistent2' Warning (Code 1266): Using storage engine MyISAM for table 't2' Error (Code 1050): Table 't2' already exists drop tables t1, t2; -<TABLE BORDER=1><TR><TH><</TH></TR><TR><TD>< & ></TD></TR></TABLE> +<TABLE BORDER=1><TR><TH><</TH></TR><TR><TD>< & ></TD></TR></TABLE>create table t1 (a char(5)); +insert into t1 values ('\0b\0'); +a +\0b\0 +a +\0b\0 ++------+ +| a | ++------+ +| b | ++------+ +*************************** 1. row *************************** +a: b +<TABLE BORDER=1><TR><TH>a</TH></TR><TR><TD> b </TD></TR></TABLE><?xml version="1.0"?> + +<resultset statement="select a from t1 +" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <row> + <field name="a"> b </field> + </row> +</resultset> +drop table t1; + End of tests |