diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-09-22 15:30:24 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-09-22 15:30:24 +0300 |
| commit | 3e83c4e8f90851040be921443b52144a2862444a (patch) | |
| tree | f76ee35018c73f2034e0e6e42c89c038f920f495 /mysql-test/r/trigger.result | |
| parent | 513923868545338c00390f35f63b92efd55f50bb (diff) | |
| parent | 79feec77ed4a7121e68be1dc16f79dcad6c5d25e (diff) | |
| download | mariadb-git-3e83c4e8f90851040be921443b52144a2862444a.tar.gz | |
Automatic merge
Diffstat (limited to 'mysql-test/r/trigger.result')
| -rw-r--r-- | mysql-test/r/trigger.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index 63193bdedbc..3310209df58 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -165,6 +165,8 @@ select @log; (BEFORE_INSERT: new=(id=1, data=1))(AFTER_INSERT: new=(id=1, data=1)) set @log:= ""; insert ignore t1 values (1, 2); +Warnings: +Warning 1062 Duplicate entry '1' for key 'PRIMARY' select @log; @log (BEFORE_INSERT: new=(id=1, data=2)) |