diff options
| author | monty@mysql.com <> | 2004-09-09 14:55:28 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-09-09 14:55:28 +0300 |
| commit | e67fcee270ba58fcde915647b1a647cdd293edd5 (patch) | |
| tree | 368687b45835bc7b5a71ef90de23cb752f4a1865 /sql/sql_prepare.cc | |
| parent | 49cd04b510cde7be3026580dc9129ecd806396ef (diff) | |
| download | mariadb-git-e67fcee270ba58fcde915647b1a647cdd293edd5.tar.gz | |
Update after merge
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 844a7723d89..124db39ef3f 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1057,7 +1057,7 @@ static int mysql_test_select(Prepared_statement *stmt, THD *thd= stmt->thd; LEX *lex= stmt->lex; SELECT_LEX_UNIT *unit= &lex->unit; - int result= 1; + int result; DBUG_ENTER("mysql_test_select"); #ifndef NO_EMBEDDED_ACCESS_CHECKS @@ -1073,6 +1073,7 @@ static int mysql_test_select(Prepared_statement *stmt, if ((result= open_and_lock_tables(thd, tables))) { + result= 1; // Error sent send_error(thd); goto err; } @@ -2223,4 +2224,3 @@ Item_arena::Type Prepared_statement::type() const { return PREPARED_STATEMENT; } - |