summaryrefslogtreecommitdiff
path: root/libmysqld/libmysqld.c
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2003-09-10 12:58:26 +0500
committerunknown <hf@deer.(none)>2003-09-10 12:58:26 +0500
commit01397f5d1978f3e629e54fc33150a4c717ccf3a4 (patch)
tree3dbdbfe4ee14d4f5c7b4a008edaac5177572b89e /libmysqld/libmysqld.c
parentaf1c7280f4fb958292ae114070ed236673252de6 (diff)
downloadmariadb-git-01397f5d1978f3e629e54fc33150a4c717ccf3a4.tar.gz
SCRUM: embedde library
Minor fixes libmysqld/lib_sql.cc: Comment added libmysqld/libmysqld.c: this part of code should be moved under if (mysql)
Diffstat (limited to 'libmysqld/libmysqld.c')
-rw-r--r--libmysqld/libmysqld.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index be6589333b7..7ac723f3050 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -311,14 +311,14 @@ error:
void STDCALL mysql_close(MYSQL *mysql)
{
DBUG_ENTER("mysql_close");
- if (mysql->methods != &embedded_methods)
- {
- cli_mysql_close(mysql);
- DBUG_VOID_RETURN;
- }
-
if (mysql) /* Some simple safety */
{
+ if (mysql->methods != &embedded_methods)
+ {
+ cli_mysql_close(mysql);
+ DBUG_VOID_RETURN;
+ }
+
my_free(mysql->options.user,MYF(MY_ALLOW_ZERO_PTR));
my_free(mysql->options.host,MYF(MY_ALLOW_ZERO_PTR));
my_free(mysql->options.password,MYF(MY_ALLOW_ZERO_PTR));