Commit 17b9fce1 authored by Michael Widenius's avatar Michael Widenius

Fix for LP#697622 Assertion `! is_set()' failed when preparing a HANDLER statement

mysql-test/suite/handler/interface.result:
  Test case
mysql-test/suite/handler/interface.test:
  Test case
sql/sql_prepare.cc:
  Fix for LP#697622 Assertion `! is_set()' failed when preparing a HANDLER statement
  Return TRUE if mysql_test_handler_read() fails.
parent 1dc0873b
...@@ -257,3 +257,5 @@ drop table t1; ...@@ -257,3 +257,5 @@ drop table t1;
USE information_schema; USE information_schema;
HANDLER COLUMNS OPEN; HANDLER COLUMNS OPEN;
ERROR HY000: Incorrect usage of HANDLER OPEN and information_schema ERROR HY000: Incorrect usage of HANDLER OPEN and information_schema
PREPARE h_r FROM 'HANDLER t1 READ `PRIMARY` LAST';
ERROR 42S02: Unknown table 't1' in HANDLER
...@@ -305,3 +305,9 @@ connection default; ...@@ -305,3 +305,9 @@ connection default;
USE information_schema; USE information_schema;
--error ER_WRONG_USAGE --error ER_WRONG_USAGE
HANDLER COLUMNS OPEN; HANDLER COLUMNS OPEN;
#
# LP#697622 Assertion `! is_set()' failed when preparing a HANDLER statement
#
--error ER_UNKNOWN_TABLE
PREPARE h_r FROM 'HANDLER t1 READ `PRIMARY` LAST';
...@@ -2004,11 +2004,8 @@ static bool check_prepared_statement(Prepared_statement *stmt) ...@@ -2004,11 +2004,8 @@ static bool check_prepared_statement(Prepared_statement *stmt)
case SQLCOM_HA_READ: case SQLCOM_HA_READ:
res= mysql_test_handler_read(stmt, tables); res= mysql_test_handler_read(stmt, tables);
{
/* Statement and field info has already been sent */ /* Statement and field info has already been sent */
DBUG_RETURN(FALSE); DBUG_RETURN(res == 1 ? TRUE : FALSE);
}
break;
/* /*
Note that we don't need to have cases in this list if they are Note that we don't need to have cases in this list if they are
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment