From 4093dcfb03e3f39bdfc7c65bea866a070bf3d11d Mon Sep 17 00:00:00 2001 From: "Tatiana A. Nurnberg" Date: Mon, 23 Mar 2009 05:08:32 +0100 Subject: [PATCH] Bug#43254: SQL_SELECT_LIMIT=0 crashes command line client When asking what database is selected, client expected to *always* get an answer from the server. We now handle failure more gracefully. See comments in ticket for a discussion of what happens, and how things interlock. client/mysql.cc: Handle empty result-sets gracefully, as opposed to just result sets with n>0 items that may themselves be empty. --- client/mysql.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/mysql.cc b/client/mysql.cc index 88ddd40fa68..e035cee16f9 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2625,7 +2625,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); }