diff options
| author | unknown <aelkin/elkin@koti.dsl.inet.fi> | 2007-10-04 12:27:14 +0300 |
|---|---|---|
| committer | unknown <aelkin/elkin@koti.dsl.inet.fi> | 2007-10-04 12:27:14 +0300 |
| commit | 7258005cd40396a7803612f95eb7092574d99023 (patch) | |
| tree | 517919629a45bfd069a7f37335db633689e2526b /mysql-test/t/mysql.test | |
| parent | 345716937c6b3ba928aed448f66f34cb61bd4f33 (diff) | |
| parent | d0b076b66cef0335a884fa96c1c636bbef31a9db (diff) | |
| download | mariadb-git-7258005cd40396a7803612f95eb7092574d99023.tar.gz | |
Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/5.1-merge
client/mysql.cc:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_class.h:
conflicting hunk is for log.h
Diffstat (limited to 'mysql-test/t/mysql.test')
| -rw-r--r-- | mysql-test/t/mysql.test | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 3ee04f32640..a7c3eda92df 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -282,6 +282,15 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug21412.sql; # --exec $MYSQL test -e "/*! \C latin1 */ select 1;" +# +# Bug#29323 mysql client only accetps ANSI encoded files +# +--write_file $MYSQLTEST_VARDIR/tmp/bug29323.sql +select "This is a file starting with UTF8 BOM 0xEFBBBF"; +EOF +--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug29323.sql 2>&1 +remove_file $MYSQLTEST_VARDIR/tmp/bug29323.sql; + --echo End of 5.0 tests # |