database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge from 5.3

Browse Source
This commit is contained in:
unknown
2012-08-24 15:29:01 +02:00
parent caa535eb9f fc666a0df6
commit ced3907c02
45 changed files with 1217 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sql/sql_string.cc
View File

@ -1121,39 +1121,47 @@ outp:
void String::print(String *str)
/*
Append characters to a single-quoted string '...', escaping special
characters as necessary.
Does not add the enclosing quotes, this is left up to caller.
*/
void String::append_for_single_quote(const char *st, uint len)
{
char *st= (char*)Ptr, *end= st+str_length;
const char *end= st+len;
for (; st < end; st++)
{
uchar c= *st;
switch (c)
{
case '\\':
str->append(STRING_WITH_LEN("\\\\"));
append(STRING_WITH_LEN("\\\\"));
break;
case '\0':
str->append(STRING_WITH_LEN("\\0"));
append(STRING_WITH_LEN("\\0"));
break;
case '\'':
str->append(STRING_WITH_LEN("\\'"));
append(STRING_WITH_LEN("\\'"));
break;
case '\n':
str->append(STRING_WITH_LEN("\\n"));
append(STRING_WITH_LEN("\\n"));
break;
case '\r':
str->append(STRING_WITH_LEN("\\r"));
append(STRING_WITH_LEN("\\r"));
break;
case '\032': // Ctrl-Z
str->append(STRING_WITH_LEN("\\Z"));
append(STRING_WITH_LEN("\\Z"));
break;
default:
str->append(c);
append(c);
}
}
}
void String::print(String *str)
{
str->append_for_single_quote(Ptr, str_length);
}
/*
Exchange state of this object and argument.