auto-merge

22d03452 · Tatiana A. Nurnberg · a21cd97c · 1b0be8c5 · 22d03452
Commit 22d03452 authored Nov 24, 2009 by Tatiana A. Nurnberg
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

client/mysql.cc client/mysql.cc +1 -3

No files found.
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -4474,9 +4474,7 @@ server_version_string(MYSQL *con)
    */
    if (server_version == NULL)
-    {
+      server_version= my_strdup(mysql_get_server_info(con), MYF(MY_WME));
-      server_version= strdup(mysql_get_server_info(con));
-    }
  }
  return server_version ? server_version : "";