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)
   {
diff --git a/sql/field.cc b/sql/field.cc
index fd0bea83a05..8bcbf8ecc56 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -4721,7 +4721,7 @@ String *Field_enum::val_str(String *val_buffer __attribute__((unused)),
 {
   uint tmp=(uint) Field_enum::val_int();
   if (!tmp || tmp > typelib->count)
-    val_ptr->set((const char*)"",0);
+    val_ptr->set("",0);
   else
     val_ptr->set((const char*) typelib->type_names[tmp-1],
 		 (uint) strlen(typelib->type_names[tmp-1]));