diff options
| author | Mikael Ronstrom <mikael.ronstrom@oracle.com> | 2011-04-20 15:15:47 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael.ronstrom@oracle.com> | 2011-04-20 15:15:47 +0200 |
| commit | d5d966a6b9fa69303884c78fac1fc51b98571643 (patch) | |
| tree | d2f0f4cd22085914480ada8ca622319b6555e8a6 /sql/sql_prepare.cc | |
| parent | 8486212a24baaa73a22fffbc01e61c6737443b46 (diff) | |
| download | mariadb-git-d5d966a6b9fa69303884c78fac1fc51b98571643.tar.gz | |
Fixed error in merge
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index dd16bda60ec..74505c06a77 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3401,7 +3401,7 @@ Prepared_statement::execute_loop(String *expanded_query, int reprepare_attempt= 0; /* Check if we got an error when sending long data */ - if (state == Query_arena::ERROR) + if (state == Query_arena::STMT_ERROR) { my_message(last_errno, last_error, MYF(0)); return TRUE; |