diff options
| author | unknown <kostja@bodhi.local> | 2007-01-11 22:15:20 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2007-01-11 22:15:20 +0300 |
| commit | c1bcbe2973c2c3a4054635bac4a787ca06758c05 (patch) | |
| tree | e4e6b520180358f870a1eeddcb51c8da437e1b44 /sql/sql_prepare.cc | |
| parent | bd27fcf8438a53d88ff292d955c13253a916b349 (diff) | |
| parent | 5ed3d05e4078032f44d74c116919d2a0ec4aa550 (diff) | |
| download | mariadb-git-c1bcbe2973c2c3a4054635bac4a787ca06758c05.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
mysql-test/r/csv.result:
Manual merge.
mysql-test/t/csv.test:
Manual 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 92366332dcd..249d69d174a 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2943,10 +2943,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; } |