Fixed error in merge

d5d966a6 · Mikael Ronstrom · 8486212a · d5d966a6
Commit d5d966a6 authored Apr 20, 2011 by Mikael Ronstrom
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_prepare.cc sql/sql_prepare.cc +1 -1

No files found.
--- 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;