trigger.result:

  merge of the 5.0-opt tree


mysql-test/r/trigger.result:
  merge of the 5.0-opt tree

mysql-test/r/trigger.result

@@ -1241,6 +1241,31 @@ i	j
 2	2
 13	13
 drop table t1;
+CREATE TABLE t1 (a INT PRIMARY KEY);
+CREATE TABLE t2 (a INT PRIMARY KEY);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+CREATE TRIGGER trg_t1 BEFORE DELETE on t1 FOR EACH ROW 
+INSERT INTO t2 VALUES (OLD.a);
+FLUSH STATUS;
+TRUNCATE t1;
+SHOW STATUS LIKE 'handler_delete';
+Variable_name	Value
+Handler_delete	0
+SELECT COUNT(*) FROM t2;
+COUNT(*)
+0
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+DELETE FROM t2;
+FLUSH STATUS;
+DELETE FROM t1;
+SHOW STATUS LIKE 'handler_delete';
+Variable_name	Value
+Handler_delete	8
+SELECT COUNT(*) FROM t2;
+COUNT(*)
+8
+DROP TRIGGER trg_t1;
+DROP TABLE t1,t2;
 drop table if exists t1;
 drop function if exists f1;
 create table t1 (i int);
@@ -1310,29 +1335,4 @@ SELECT fubar_id FROM t2;
 fubar_id
 1
 DROP TABLE t1,t2;
-CREATE TABLE t1 (a INT PRIMARY KEY);
-CREATE TABLE t2 (a INT PRIMARY KEY);
-INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8);
-CREATE TRIGGER trg_t1 BEFORE DELETE on t1 FOR EACH ROW 
-INSERT INTO t2 VALUES (OLD.a);
-FLUSH STATUS;
-TRUNCATE t1;
-SHOW STATUS LIKE 'handler_delete';
-Variable_name	Value
-Handler_delete	0
-SELECT COUNT(*) FROM t2;
-COUNT(*)
-0
-INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8);
-DELETE FROM t2;
-FLUSH STATUS;
-DELETE FROM t1;
-SHOW STATUS LIKE 'handler_delete';
-Variable_name	Value
-Handler_delete	8
-SELECT COUNT(*) FROM t2;
-COUNT(*)
-8
-DROP TRIGGER trg_t1;
-DROP TABLE t1,t2;
 End of 5.0 tests