diff options
| author | Jim Winstead <jimw@mysql.com> | 2009-07-14 17:03:51 -0700 |
|---|---|---|
| committer | Jim Winstead <jimw@mysql.com> | 2009-07-14 17:03:51 -0700 |
| commit | c754b00a1f79d1ea78b1a2d2c51a1b2281500fff (patch) | |
| tree | 38245993a10bee6436ac1dd95810492d67293a44 /mysql-test | |
| parent | f0f4efd77e3eb7d62176396b5ccf53d7a7029c85 (diff) | |
| download | mariadb-git-c754b00a1f79d1ea78b1a2d2c51a1b2281500fff.tar.gz | |
The handling of NUL bytes in column data in the various output formats
supported by the mysql client was inconsistent. (Bug #28203)
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysql.result | 28 | ||||
| -rw-r--r-- | mysql-test/t/mysql.test | 14 |
2 files changed, 39 insertions, 3 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 101518289e9..623ab66aa35 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 @@ -200,5 +200,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 diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 91679c8c2ff..8e305e05aa2 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -372,5 +372,19 @@ drop tables t1, t2; # --exec $MYSQL --html test -e "select '< & >' as \`<\`" +# +# Bug #27884: mysql client + null byte +# +create table t1 (a char(5)); +insert into t1 values ('\0b\0'); +--exec $MYSQL test -e "select a from t1" +--exec $MYSQL -r test -e "select a from t1" +--exec $MYSQL -s test -e "select a from t1" +--exec $MYSQL --table test -e "select a from t1" +--exec $MYSQL --vertical test -e "select a from t1" +--exec $MYSQL --html test -e "select a from t1" +--exec $MYSQL --xml test -e "select a from t1" +drop table t1; + --echo --echo End of tests |