From 7dc83c50436a36280e99f9c71006b05452d0b9fe Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Fri, 9 Jan 2009 06:11:37 +0200 Subject: Fixed bugs from my latest patch found by pushbuild: Bug #41962 Maria: view-related test failures (insert, view, maria, trigger tests) Added error handling for wrong update of view. See Bug #41760 Inserting into multiple-table views is not working mysql-test/r/delayed.result: Fixed test as we are now testing values before fields. Added new tests to test all error combinations mysql-test/suite/maria/r/maria.result: Added error handling for not supported update of view. mysql-test/suite/maria/t/maria.test: Added error handling for not supported update of view. mysql-test/t/delayed.test: Fixed test as we are now testing values before fields. Added new tests to test all error combinations sql/sql_base.cc: Fixed warning from valgrind sql/sql_insert.cc: Don't test from which table values are in case of INSERT ... SELECT Run fix_fields() in values before we do it on fields. This is needed becasue check_view_single_update() are accessing values. storage/maria/ma_blockrec.c: Don't call pagecache_delete_pages() if no pages to delete. This fixes a DBUG_ASSERT() error in maria_test_recovery --- mysql-test/r/delayed.result | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mysql-test/r/delayed.result') diff --git a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result index bcda6ddb6ab..65b358615cf 100644 --- a/mysql-test/r/delayed.result +++ b/mysql-test/r/delayed.result @@ -251,8 +251,12 @@ HEX(a) 1 DROP TABLE t1; CREATE TABLE t1 (a INT); -INSERT DELAYED INTO t1 SET b= b(); +INSERT DELAYED INTO t1 SET a= b(); +ERROR 42000: FUNCTION test.b does not exist +INSERT DELAYED INTO t1 SET b= 1; ERROR 42S22: Unknown column 'b' in 'field list' +INSERT DELAYED INTO t1 SET b= b(); +ERROR 42000: FUNCTION test.b does not exist DROP TABLE t1; End of 5.0 tests DROP TABLE IF EXISTS t1,t2; -- cgit v1.2.1