Code cleanup

6e58a7c4 · monty@mysql.com · 3ce5c56d · 6e58a7c4 · 6e58a7c4
Commit 6e58a7c4 authored Dec 18, 2003 by monty@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

client/mysql.cc client/mysql.cc +5 -2

sql/field.cc sql/field.cc +1 -1

No files found.
--- 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);
+  if (connected)
-  connected= 0;
+  {
+    connected= 0;
+    mysql_close(&mysql);
+  }
  mysql_init(&mysql);
  if (opt_connect_timeout)
  {

--- 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]));