diff options
| author | unknown <konstantin@mysql.com> | 2005-01-13 02:19:35 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-01-13 02:19:35 +0300 |
| commit | 3000bec157fffe80bf311dd4fbb3316bf64036e5 (patch) | |
| tree | b9ba03dff033e6f9d0b3a4c96fd001010187fdb6 /sql/sql_analyse.cc | |
| parent | 4596579c999c7dbf5e0f9152fb0d645e94e11e7c (diff) | |
| parent | 069d260b0ea1bd77d1f8c31f2b137dd809830858 (diff) | |
| download | mariadb-git-3000bec157fffe80bf311dd4fbb3316bf64036e5.tar.gz | |
Manual merge.
sql/sql_analyse.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_analyse.cc')
| -rw-r--r-- | sql/sql_analyse.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc index a8c0d689794..6a9a9e51231 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -1029,20 +1029,19 @@ uint check_ulonglong(const char *str, uint length) } /* check_ulonlong */ - /* - FUNCTION: append_escaped() - + Quote special characters in a string. + + SYNOPSIS + append_escaped(to_str, from_str) + to_str (in) A pointer to a String. + from_str (to) A pointer to an allocated string + DESCRIPTION append_escaped() takes a String type variable, where it appends escaped the second argument. Only characters that require escaping will be escaped. - ARGUMENTS - A pointer to a String variable, where results will be appended - A pointer to a String variable, which is appended to the result - String, escaping those characters that require it. - RETURN VALUES 0 Success 1 Out of memory |