diff options
| author | unknown <davi@buzz.(none)> | 2008-02-20 23:30:29 -0200 |
|---|---|---|
| committer | unknown <davi@buzz.(none)> | 2008-02-20 23:30:29 -0200 |
| commit | 88421ee5038ebe83d448110c3386086c2bc71a1f (patch) | |
| tree | 5d96b46c6fb6969f598cf7fe5155eab1f96e6cee | |
| parent | 96b4648b010add765d714d829b492aff6e69f1d2 (diff) | |
| download | mariadb-git-88421ee5038ebe83d448110c3386086c2bc71a1f.tar.gz | |
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.
| -rw-r--r-- | mysql-test/r/view.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/view.test | 1 | ||||
| -rw-r--r-- | sql/sql_cursor.cc | 2 | ||||
| -rw-r--r-- | tests/mysql_client_test.c | 3 |
4 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index e94b127b895..c42a47422b2 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -3729,6 +3729,7 @@ create view a as select 1; end| call p(); call p(); +drop view a; drop procedure p; # ----------------------------------------------------------------- # -- Bug#34337: Server crash when Altering a view using a table name. diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index 347ae41b1f0..5c600f05f12 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -3619,6 +3619,7 @@ end| delimiter ;| call p(); call p(); +drop view a; drop procedure p; ########################################################################### 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))) diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 82a9b964fcc..6f3abfaa0b0 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -16109,8 +16109,6 @@ static void test_bug24179() } -/* - /** Bug#32265 Server returns different metadata if prepared statement is used */ @@ -16191,6 +16189,7 @@ static void test_bug32265() DBUG_VOID_RETURN; } +/* Bug#28075 "COM_DEBUG crashes mysqld" */ |