bzr commit into mysql-6.0-bugteam branch (gshchepa:3028)

[Gleb Shchepa]

#At file:///work/bzr/mysql-6.0-bugteam/ based on revid:aelkin@stripped

 3028 Gleb Shchepa	2009-02-05 [merge]
      automerge 5.1-bugteam --> 6.0-bugteam
modified:
  mysql-test/suite/funcs_1/r/innodb_trig_09.result
  mysql-test/suite/funcs_1/r/memory_trig_09.result
  mysql-test/suite/funcs_1/r/myisam_trig_09.result
  mysql-test/suite/funcs_1/r/ndb_trig_09.result
  mysql-test/suite/funcs_1/triggers/triggers_09.inc

=== modified file 'mysql-test/suite/funcs_1/r/innodb_trig_09.result'
--- a/mysql-test/suite/funcs_1/r/innodb_trig_09.result	2009-01-31 21:00:48 +0000
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result	2009-02-05 13:52:18 +0000
@@ -183,7 +183,8 @@ a	NULL	Test 3.5.9.4	7	999	995.2400000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-ERROR 23000: Column 'f136' cannot be null
+Warnings:
+Warning	1048	Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3

=== modified file 'mysql-test/suite/funcs_1/r/memory_trig_09.result'
--- a/mysql-test/suite/funcs_1/r/memory_trig_09.result	2009-01-31 21:00:48 +0000
+++ b/mysql-test/suite/funcs_1/r/memory_trig_09.result	2009-02-05 13:52:18 +0000
@@ -184,7 +184,8 @@ a	NULL	Test 3.5.9.4	7	999	995.2400000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-ERROR 23000: Column 'f136' cannot be null
+Warnings:
+Warning	1048	Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3

=== modified file 'mysql-test/suite/funcs_1/r/myisam_trig_09.result'
--- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result	2009-01-31 21:00:48 +0000
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result	2009-02-05 13:52:18 +0000
@@ -184,7 +184,8 @@ a	NULL	Test 3.5.9.4	7	999	995.2400000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-ERROR 23000: Column 'f136' cannot be null
+Warnings:
+Warning	1048	Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3

=== modified file 'mysql-test/suite/funcs_1/r/ndb_trig_09.result'
--- a/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2009-01-31 21:00:48 +0000
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2009-02-05 13:52:18 +0000
@@ -183,7 +183,8 @@ a	NULL	Test 3.5.9.4	7	999	995.2400000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-ERROR 23000: Column 'f136' cannot be null
+Warnings:
+Warning	1048	Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_09.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_09.inc	2009-01-31 21:00:48 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_09.inc	2009-02-05 13:52:18 +0000
@@ -184,7 +184,6 @@ let $message= Testcase 3.5.9.4:;
 		@tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
 --enable_query_log
 
---error ER_BAD_NULL_ERROR
 	Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 		 where f122='Test 3.5.9.4';