database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bodhi.local:/opt/local/work/mysql-5.0-4968

Browse Source 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
This commit is contained in:
kostja@bodhi.local
2006-12-01 13:26:49 +03:00
parent 2fbb40b9c7 87a87bc04b
commit 88dadbbf60
4 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_prepare.cc
View File

@@ -2947,10 +2947,9 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
in INSERT ... SELECT and similar commands.
*/
if (open_cursor && lex->result && !lex->result->simple_select())
if (open_cursor && lex->result && lex->result->check_simple_select())
{
DBUG_PRINT("info",("Cursor asked for not SELECT stmt"));
my_error(ER_SP_BAD_CURSOR_QUERY, MYF(0));
return TRUE;
}