diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-03 21:35:51 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-03 21:35:51 +0400 |
| commit | 3df8e88dd84e3bb6512e8c33498df5db4823d18a (patch) | |
| tree | 4c53541bd85faea4f3fca21d63e1f8880d3c9189 /mysql-test/t/trigger.test | |
| parent | 018b0d3ee7883da0a9ae294bb2d25b747f9e3a41 (diff) | |
| parent | 0cb83d46e4fd678794ef4d487a10bec6e43688f0 (diff) | |
| download | mariadb-git-3df8e88dd84e3bb6512e8c33498df5db4823d18a.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
Text conflict in sql/log.cc
Text conflict in sql/set_var.cc
Text conflict in sql/sql_class.cc
Diffstat (limited to 'mysql-test/t/trigger.test')
| -rw-r--r-- | mysql-test/t/trigger.test | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test index 8ba21ed696a..e929b4b39cc 100644 --- a/mysql-test/t/trigger.test +++ b/mysql-test/t/trigger.test @@ -2426,6 +2426,19 @@ INSERT IGNORE INTO t2 SET a = '777'; DROP TRIGGER trg1; DROP TABLE t1, t2; +# +# Bug #48525: trigger changes "Column 'id' cannot be null" behaviour +# +CREATE TABLE t1 (id INT NOT NULL); +CREATE TABLE t2 (id INT NOT NULL); +INSERT t1 VALUES (1),(2),(3); +UPDATE t1 SET id=NULL; +CREATE TRIGGER t1_bu BEFORE UPDATE ON t1 FOR EACH ROW + INSERT INTO t2 VALUES (3); +UPDATE t1 SET id=NULL; +DROP TRIGGER t1_bu; +DROP TABLE t1,t2; + --echo End of 5.1 tests. |