summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-07-28 16:10:14 +0300
committermonty@mysql.com <>2005-07-28 16:10:14 +0300
commitb3cbd0048fe5fe36fe4fba9ce591b0d1b26e10a1 (patch)
treeaf22629d2c36ae4196e6f23584c4cecc393b874e /libmysql
parent510d9a19e1dc52a4d07fb5c601cd4cb3dd6aca4a (diff)
downloadmariadb-git-b3cbd0048fe5fe36fe4fba9ce591b0d1b26e10a1.tar.gz
Cleanups during review of new code
Ensure mysql_close() is called if mysql_set_character_set() fails
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 024d19ff24b..3931d7947aa 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1599,13 +1599,8 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from,
ulong length)
{
if (mysql->server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)
- {
return escape_quotes_for_mysql(mysql->charset, to, 0, from, length);
- }
- else
- {
- return escape_string_for_mysql(mysql->charset, to, 0, from, length);
- }
+ return escape_string_for_mysql(mysql->charset, to, 0, from, length);
}