Bug 38158: mysql client regression, can't read dump files
- Revert the fix for bug 33812 - fixed a win32 warning
This commit is contained in:
parent
e390f843d5
commit
5c256ec67a
@ -2081,6 +2081,37 @@ static bool add_line(String &buffer,char *line,char *in_string,
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else if (!*ml_comment && !*in_string &&
|
||||
(end_of_line - pos) >= 10 &&
|
||||
!my_strnncoll(charset_info, (uchar*) pos, 10,
|
||||
(const uchar*) "delimiter ", 10))
|
||||
{
|
||||
// Flush previously accepted characters
|
||||
if (out != line)
|
||||
{
|
||||
buffer.append(line, (uint32) (out - line));
|
||||
out= line;
|
||||
}
|
||||
|
||||
// Flush possible comments in the buffer
|
||||
if (!buffer.is_empty())
|
||||
{
|
||||
if (com_go(&buffer, 0) > 0) // < 0 is not fatal
|
||||
DBUG_RETURN(1);
|
||||
buffer.length(0);
|
||||
}
|
||||
|
||||
/*
|
||||
Delimiter wants the get rest of the given line as argument to
|
||||
allow one to change ';' to ';;' and back
|
||||
*/
|
||||
buffer.append(pos);
|
||||
if (com_delimiter(&buffer, pos) > 0)
|
||||
DBUG_RETURN(1);
|
||||
|
||||
buffer.length(0);
|
||||
break;
|
||||
}
|
||||
else if (!*ml_comment && !*in_string && is_prefix(pos, delimiter))
|
||||
{
|
||||
// Found a statement. Continue parsing after the delimiter
|
||||
|
@ -38,8 +38,6 @@ t2
|
||||
t3
|
||||
Tables_in_test
|
||||
t1
|
||||
delimiter
|
||||
1
|
||||
_
|
||||
Test delimiter : from command line
|
||||
a
|
||||
|
@ -60,12 +60,6 @@ use test//
|
||||
show tables//
|
||||
delimiter ; # Reset delimiter
|
||||
|
||||
#
|
||||
# Bug #33812: mysql client incorrectly parsing DELIMITER
|
||||
#
|
||||
select a as delimiter from t1
|
||||
delimiter ; # Reset delimiter
|
||||
|
||||
#
|
||||
# Bug #36244: MySQL CLI doesn't recognize standalone -- as comment
|
||||
# before DELIMITER statement
|
||||
|
@ -1017,7 +1017,7 @@ static const char *my_get_module_parent(char *buf, size_t size)
|
||||
{
|
||||
char *last= NULL;
|
||||
char *end;
|
||||
if (!GetModuleFileName(NULL, buf, size))
|
||||
if (!GetModuleFileName(NULL, buf, (DWORD) size))
|
||||
return NULL;
|
||||
end= strend(buf);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user