summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-12-18 01:13:52 +0200
committerunknown <monty@mysql.com>2003-12-18 01:13:52 +0200
commit6b1e06e62080e684f61ef6d278d91a2f4c8c4309 (patch)
tree2abc86f62e7c03be7bbb6469bcb7cee128eb2660 /client
parentfd3235dcd339ee8b67ba23e21559d75a59e97d7e (diff)
downloadmariadb-git-6b1e06e62080e684f61ef6d278d91a2f4c8c4309.tar.gz
Code cleanup
client/mysql.cc: Don't call mysql_close() on not initialized object sql/field.cc: code cleanup
Diffstat (limited to 'client')
-rw-r--r--client/mysql.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 370213d4fc4..15770d2eb52 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2228,8 +2228,11 @@ static int
sql_real_connect(char *host,char *database,char *user,char *password,
uint silent)
{
- mysql_close(&mysql);
- connected= 0;
+ if (connected)
+ {
+ connected= 0;
+ mysql_close(&mysql);
+ }
mysql_init(&mysql);
if (opt_connect_timeout)
{