summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorbar@mysql.com/bar.myoffice.izhnet.ru <>2007-10-04 13:06:01 +0500
committerbar@mysql.com/bar.myoffice.izhnet.ru <>2007-10-04 13:06:01 +0500
commit2b42750a513acf4c3b424e1de2f96282d6ad5f87 (patch)
tree9a32d919ba7b45b7843068fafa4433d65f6c1dff /mysql-test
parentd155f65a9655917de9d4bc03d026aabfa282a752 (diff)
downloadmariadb-git-2b42750a513acf4c3b424e1de2f96282d6ad5f87.tar.gz
Bug#29323 mysql client only accetps ANSI encoded files
Fix: ignore BOM marker in the first line.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/mysql.result2
-rw-r--r--mysql-test/t/mysql.test9
2 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index c6e589a5fb7..eded1a3fc3b 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -178,4 +178,6 @@ ERROR at line 1: DELIMITER cannot contain a backslash character
1
1
1
+This is a file starting with UTF8 BOM 0xEFBBBF
+This is a file starting with UTF8 BOM 0xEFBBBF
End of 5.0 tests
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index 6e97d0faede..182b292c817 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -281,4 +281,13 @@ 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