diff options
| author | unknown <kostja@bodhi.local> | 2006-12-01 13:58:22 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-12-01 13:58:22 +0300 |
| commit | 8ffed8be8802e90637e47452c452471aa251a8f7 (patch) | |
| tree | 86d767f7beb9e226087be6f8c3eaca21d058cab8 /sql/sql_prepare.cc | |
| parent | cf245c8f3a5c285af6e53a0035d05262ea5fbe31 (diff) | |
| parent | ec00e02c9a441eed4060cef8e714e9ac86568acb (diff) | |
| download | mariadb-git-8ffed8be8802e90637e47452c452471aa251a8f7.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime
server-tools/instance-manager/guardian.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 6f810f13d9c..7741ae13a17 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2946,10 +2946,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; } |