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

Merge zim.(none):/home/ian/workspace/mysql-5.0

Browse Source 
into  zim.(none):/home/ian/workspace/mysql-5.1-new

Updated bug message in disabled file -Brian
This commit is contained in:
ian@zim.(none)
2006-03-27 19:48:44 -08:00
parent 1ec1587cd3 34b54fa83c
commit 9caff206c2
9 changed files with 109 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/parse_file.cc
View File

@ -546,7 +546,7 @@ parse_string(char *ptr, char *end, MEM_ROOT *mem_root, LEX_STRING *str)
read escaped string from ptr to eol in already allocated str
SYNOPSIS
parse_escaped_string()
read_escaped_string()
ptr - pointer on string beginning
eol - pointer on character after end of string
str - target string
@ -617,7 +617,7 @@ read_escaped_string(char *ptr, char *eol, LEX_STRING *str)
# - pointer on symbol after string
*/
static char *
char *
parse_escaped_string(char *ptr, char *end, MEM_ROOT *mem_root, LEX_STRING *str)
{
char *eol= strchr(ptr, '\n');
@ -635,7 +635,7 @@ parse_escaped_string(char *ptr, char *end, MEM_ROOT *mem_root, LEX_STRING *str)
parse '' delimited escaped string
SYNOPSIS
parse_escaped_string()
parse_quoted_escaped_string()
ptr - pointer on string beginning
end - pointer on symbol after parsed string end (still owned
by buffer and can be accessed