From 88421ee5038ebe83d448110c3386086c2bc71a1f Mon Sep 17 00:00:00 2001
From: unknown <davi@buzz.(none)>
Date: Wed, 20 Feb 2008 23:30:29 -0200
Subject: Post-merge fixes for bugs 34587 and 32265.

mysql-test/r/view.result:
  Drop created view.
mysql-test/t/view.test:
  Update test result.
sql/sql_cursor.cc:
  Fix compilation failure.
tests/mysql_client_test.c:
  Manual merge.
---
 sql/sql_cursor.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_cursor.cc')

diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc
index 138116c9283..5c4e93d4c74 100644
--- a/sql/sql_cursor.cc
+++ b/sql/sql_cursor.cc
@@ -588,7 +588,7 @@ int Materialized_cursor::fill_item_list(THD *thd, List<Item> &send_fields)
 end:
   thd->restore_active_arena(this, &backup_arena);
   /* Check for thd->is_error() in case of OOM */
-  return rc || thd->net.report_error;
+  return rc || thd->is_error();
 }
 
 int Materialized_cursor::open(JOIN *join __attribute__((unused)))
-- 
cgit v1.2.1