auto-merge

2e4ac396 · Tatiana A. Nurnberg · a9c1df93 · 4093dcfb · 2e4ac396
Commit 2e4ac396 authored Mar 23, 2009 by Tatiana A. Nurnberg
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2667,7 +2667,7 @@ static void get_current_db()
      (res= mysql_use_result(&mysql)))
  {
    MYSQL_ROW row= mysql_fetch_row(res);
-    if (row[0])
+    if (row && row[0])
      current_db= my_strdup(row[0], MYF(MY_WME));
    mysql_free_result(res);
  }