diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /mysql-test/r/merge_debug.result | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'mysql-test/r/merge_debug.result')
| -rw-r--r-- | mysql-test/r/merge_debug.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/merge_debug.result b/mysql-test/r/merge_debug.result index b857ff597f2..869d9e7536c 100644 --- a/mysql-test/r/merge_debug.result +++ b/mysql-test/r/merge_debug.result @@ -10,11 +10,11 @@ INSERT INTO crashed VALUES (10); INSERT INTO t2 VALUES (20); INSERT INTO t3 VALUES (30); LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, crashed WRITE; -SET GLOBAL debug="+d,*,myisam_pretend_crashed_table_on_open"; +SET GLOBAL debug="+d,myisam_pretend_crashed_table_on_open"; CREATE TRIGGER t1_ai AFTER INSERT ON crashed FOR EACH ROW INSERT INTO t2 VALUES(29); SET GLOBAL debug=@orig_debug; INSERT INTO t4 VALUES (39); -ERROR HY000: Table 't4' was not locked with LOCK TABLES +ERROR HY000: Table 'crashed' was not locked with LOCK TABLES INSERT INTO crashed VALUES (11); ERROR HY000: Table 'crashed' was not locked with LOCK TABLES INSERT INTO t2 VALUES (21); |