diff options
| author | unknown <ian@zim.(none)> | 2006-03-27 19:48:44 -0800 |
|---|---|---|
| committer | unknown <ian@zim.(none)> | 2006-03-27 19:48:44 -0800 |
| commit | effd72a9eaeb71f354636099506121dcd84f6b15 (patch) | |
| tree | bfe4957858d6f08b9e8ccca1d102b7fa07b06d7c /sql/parse_file.cc | |
| parent | 9c9e068488b2d2f72d322272a7a8b24182588ebe (diff) | |
| parent | 4faee6658a19db81e756a57b6d45f48610074f0a (diff) | |
| download | mariadb-git-effd72a9eaeb71f354636099506121dcd84f6b15.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
BitKeeper/etc/ignore:
auto-union
include/mysql.h:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql-common/client.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/parse_file.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
mysql-test/t/disabled.def:
Changing message to add in bug numnber
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 |