diff options
| -rw-r--r-- | libmysql/libmysql.c | 4 | ||||
| -rw-r--r-- | mysql-test/include/have_bug25714.inc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 2bf899b63e3..422a23e5bff 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4682,10 +4682,12 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) NET *net; DBUG_ENTER("cli_read_binary_rows"); + DBUG_ENTER("cli_read_binary_rows"); + if (!mysql) { set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate); - return 1; + DBUG_RETURN(1); } net = &mysql->net; diff --git a/mysql-test/include/have_bug25714.inc b/mysql-test/include/have_bug25714.inc index 0c995cd0d4c..0c09ae1a035 100644 --- a/mysql-test/include/have_bug25714.inc +++ b/mysql-test/include/have_bug25714.inc @@ -3,5 +3,5 @@ # --require r/have_bug25714.require disable_query_log; -eval select LENGTH("MYSQL_BUG25714") > 0 as "have_bug25714_exe"; +eval select LENGTH("$MYSQL_BUG25714") > 0 as "have_bug25714_exe"; enable_query_log; |