diff options
| author | monty@mysql.com <> | 2005-07-28 16:10:14 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-07-28 16:10:14 +0300 |
| commit | b3cbd0048fe5fe36fe4fba9ce591b0d1b26e10a1 (patch) | |
| tree | af22629d2c36ae4196e6f23584c4cecc393b874e /mysys/charset.c | |
| parent | 510d9a19e1dc52a4d07fb5c601cd4cb3dd6aca4a (diff) | |
| download | mariadb-git-b3cbd0048fe5fe36fe4fba9ce591b0d1b26e10a1.tar.gz | |
Cleanups during review of new code
Ensure mysql_close() is called if mysql_set_character_set() fails
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index fbdfa12c7a1..701170b747b 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -588,6 +588,7 @@ CHARSET_INFO *get_charset_by_csname(const char *cs_name, ~0 The escaped string did not fit in the to buffer >=0 The length of the escaped string */ + ulong escape_string_for_mysql(CHARSET_INFO *charset_info, char *to, ulong to_length, const char *from, ulong length) @@ -702,6 +703,7 @@ ulong escape_string_for_mysql(CHARSET_INFO *charset_info, ~0 The escaped string did not fit in the to buffer >=0 The length of the escaped string */ + ulong escape_quotes_for_mysql(CHARSET_INFO *charset_info, char *to, ulong to_length, const char *from, ulong length) @@ -714,7 +716,6 @@ ulong escape_quotes_for_mysql(CHARSET_INFO *charset_info, #endif for (end= from + length; from < end; from++) { - char escape= 0; #ifdef USE_MB int tmp_length; if (use_mb_flag && (tmp_length= my_ismbchar(charset_info, from, end))) |