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

Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0

into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/5.1-merge
This commit is contained in:
aelkin/elkin@koti.dsl.inet.fi
2007-10-04 12:27:14 +03:00
5 changed files with 40 additions and 3 deletions

View File

@ -1082,6 +1082,17 @@ static int read_and_execute(bool interactive)
if (!interactive)
{
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++;
if (!glob_buffer.length())
status.query_start_line=line_number;