diff options
| author | ian@zim.(none) <> | 2006-03-27 19:48:44 -0800 |
|---|---|---|
| committer | ian@zim.(none) <> | 2006-03-27 19:48:44 -0800 |
| commit | 9caff206c2eeec2cfbcc4aebca60c4c1fe69b8f9 (patch) | |
| tree | bfe4957858d6f08b9e8ccca1d102b7fa07b06d7c /sql/parse_file.cc | |
| parent | 1ec1587cd3749f6ab41c57a1c766287851ce0480 (diff) | |
| parent | 34b54fa83c65ee0bb7000548f41c6359d58b82d1 (diff) | |
| download | mariadb-git-9caff206c2eeec2cfbcc4aebca60c4c1fe69b8f9.tar.gz | |
Merge zim.(none):/home/ian/workspace/mysql-5.0
into zim.(none):/home/ian/workspace/mysql-5.1-new
Updated bug message in disabled file -Brian
Diffstat (limited to 'sql/parse_file.cc')
| -rw-r--r-- | sql/parse_file.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/parse_file.cc b/sql/parse_file.cc index 7faa4081d7d..0071d59242e 100644 --- a/sql/parse_file.cc +++ b/sql/parse_file.cc @@ -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 |