diff options
| author | malff/marcsql@weblab.(none) <> | 2007-01-02 14:18:13 -0700 |
|---|---|---|
| committer | malff/marcsql@weblab.(none) <> | 2007-01-02 14:18:13 -0700 |
| commit | 0055056c91426b11be40a70902230ef5d0dcdcdd (patch) | |
| tree | 1a43bc5c6b21902a943e0a8759f9f36c9c407c1c /sql/sql_prepare.cc | |
| parent | 60a3f102a475fc38dc0efcd1519b3385a39fb752 (diff) | |
| parent | c55862698ebc7aafdfeeba47170c9f7b89b66eec (diff) | |
| download | mariadb-git-0055056c91426b11be40a70902230ef5d0dcdcdd.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-merge
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 2a162216add..d95c434390c 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2945,10 +2945,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; } |