database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#29323 mysql client only accetps ANSI encoded files

Browse Source 
Fix: ignore BOM marker in the first line.
This commit is contained in:
bar@mysql.com/bar.myoffice.izhnet.ru
2007-10-04 13:06:01 +05:00
parent d155f65a96
commit 2b42750a51
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/mysql.cc
View File

@ -1042,6 +1042,17 @@ static int read_and_execute(bool interactive)
if (!interactive) if (!interactive)
{ {
line=batch_readline(status.line_buff); line=batch_readline(status.line_buff);
/*
Skip UTF8 Byte Order Marker (BOM) 0xEFBBBF.
Editors like "notepad" put this marker in
the very beginning of a text file when
you save the file using "Unicode UTF-8" format.
*/
if (!line_number &&
(uchar) line[0] == 0xEF &&
(uchar) line[1] == 0xBB &&
(uchar) line[2] == 0xBF)
line+= 3;
line_number++; line_number++;
if (!glob_buffer.length()) if (!glob_buffer.length())
status.query_start_line=line_number; status.query_start_line=line_number;

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

@ -178,4 +178,6 @@ ERROR at line 1: DELIMITER cannot contain a backslash character
1 1
1 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 End of 5.0 tests

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

@ -281,4 +281,13 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug21412.sql;
# #
--exec $MYSQL test -e "/*! \C latin1 */ select 1;" --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 --echo End of 5.0 tests