This changeset belongs to

        WL#3397 Refactoring storage engine test cases (for falcon)
      It contains fixes according to second code review.
- Remove any occurence of hardcoded assignments of storage engines
- Use variable names exact telling what it is used for
- Updated comments
- remove trailing spaces


mysql-test/include/handler.inc:
  - Replace hardcoded MyISAM with assignments via variable
mysql-test/include/mix1.inc:
  - Replace hardcoded MyISAM with assignments via variable
  - Remove hardcoded InnoDB assignments (They were introduced by late push)
  - Remove trailing spaces
mysql-test/include/mix2.inc:
  - Replace hardcode MyISAM assignments
  - Remove trailing spaces
  - Engine assignments via variable refers to the use of the storage engine
    $other_non_trans_engine_type, $other_live_chcks_engine_type ...
mysql-test/include/read_many_rows.inc:
  Replace hardcoded MyISAM assignment
mysql-test/include/rowid_order.inc:
  remove trailing spaces
mysql-test/r/handler_innodb.result:
  Updated result
mysql-test/r/handler_myisam.result:
  Updated result
mysql-test/r/innodb_mysql.result:
  Updated result
mysql-test/r/mix2_myisam.result:
  Updated result
mysql-test/r/read_many_rows_innodb.result:
  Updated result
mysql-test/r/rowid_order_innodb.result:
  Updated result
mysql-test/t/handler_innodb.test:
  Introduce $variables
mysql-test/t/handler_myisam.test:
  Introduce $variables
mysql-test/t/mix2_myisam.test:
  Introduce $variables
mysql-test/t/read_many_rows_innodb.test:
  Introduce $variables

1 files changed, 6 insertions, 6 deletions

diff --git a/mysql-test/r/mix2_myisam.result b/mysql-test/r/mix2_myisam.result
index bb9d0f5a527..9a7d71820f8 100644
--- a/mysql-test/r/mix2_myisam.result
+++ b/mysql-test/r/mix2_myisam.result
@@ -764,7 +764,7 @@ drop table t1;
 create database mysqltest;
 create table mysqltest.t1 (a int not null) engine= MyISAM;
 insert into mysqltest.t1 values(1);
-create table mysqltest.t2 (a int not null) engine= MyISAM;
+create table mysqltest.t2 (a int not null) engine= MEMORY;
 insert into mysqltest.t2 values(1);
 create table mysqltest.t3 (a int not null) engine= MEMORY;
 insert into mysqltest.t3 values(1);
@@ -1208,7 +1208,7 @@ KEY `id_version` (`id_version`)
 ) ENGINE=MyISAM;
 INSERT INTO t2 VALUES("3524", "1"),("3525", "1"),("1794", "4"),("102", "5"),("1822", "6"),("3382", "9");
 SELECT t2.id, t1.`label` FROM t2 INNER JOIN
-(SELECT t1.id_object as id_object FROM t1 WHERE t1.`label` LIKE '%test%') AS lbl 
+(SELECT t1.id_object as id_object FROM t1 WHERE t1.`label` LIKE '%test%') AS lbl
 ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
 id	label
 3382	Test
@@ -2331,7 +2331,7 @@ hex(ind)	hex(string1)
 1	
 drop table t1,t2;
 create table t2 (
-a int, b char(10), filler char(10), primary key(a, b(2)) 
+a int, b char(10), filler char(10), primary key(a, b(2))
 ) character set utf8 engine = MyISAM;
 insert into t2 values (1,'abcdefg','one');
 insert into t2 values (2,'ijkilmn','two');
@@ -2339,7 +2339,7 @@ insert into t2 values (3, 'qrstuvw','three');
 update t2 set a=5, filler='booo' where a=1;
 drop table t2;
 create table t2 (
-a int, b char(10), filler char(10), primary key(a, b(2)) 
+a int, b char(10), filler char(10), primary key(a, b(2))
 ) character set ucs2 engine = MyISAM;
 insert into t2 values (1,'abcdefg','one');
 insert into t2 values (2,'ijkilmn','two');
@@ -2398,13 +2398,13 @@ insert into t4(a) values (1),(2),(3);
 insert into t3(a) values (5),(7),(8);
 insert into t4(a) values (5),(7),(8);
 insert into t5(a) values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12);
-create trigger t1t before insert on t1 for each row begin 
+create trigger t1t before insert on t1 for each row begin
 INSERT INTO t2 SET a = NEW.a;
 end |
 create trigger t2t before insert on t2 for each row begin
 DELETE FROM t3 WHERE a = NEW.a;
 end |
-create trigger t3t before delete on t3 for each row begin  
+create trigger t3t before delete on t3 for each row begin
 UPDATE t4 SET b = b + 1 WHERE a = OLD.a;
 end |
 create trigger t4t before update on t4 for each row begin