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

4 files changed, 14 insertions, 0 deletions

diff --git a/mysql-test/t/handler_innodb.test b/mysql-test/t/handler_innodb.test
index 7f9fdb8de56..02982716f78 100644
--- a/mysql-test/t/handler_innodb.test
+++ b/mysql-test/t/handler_innodb.test
@@ -14,5 +14,7 @@
 
 --source include/have_innodb.inc
 let $engine_type= InnoDB;
+let $other_engine_type= MEMORY;
+let $other_handler_engine_type= MyISAM;
 
 --source include/handler.inc
diff --git a/mysql-test/t/handler_myisam.test b/mysql-test/t/handler_myisam.test
index 90acfae1311..644c28de5b2 100644
--- a/mysql-test/t/handler_myisam.test
+++ b/mysql-test/t/handler_myisam.test
@@ -13,5 +13,9 @@
 --source include/not_embedded.inc
 
 let $engine_type= MyISAM;
+let $other_engine_type= MEMORY;
+# There is unfortunately no other all time available storage engine
+# which supports the handler interface
+let $other_handler_engine_type= MyISAM;
 
 --source include/handler.inc
diff --git a/mysql-test/t/mix2_myisam.test b/mysql-test/t/mix2_myisam.test
index 65e22f5d540..afb3caca0ea 100644
--- a/mysql-test/t/mix2_myisam.test
+++ b/mysql-test/t/mix2_myisam.test
@@ -5,6 +5,13 @@
 
 let $engine_type= MyISAM;
 let $other_engine_type= MEMORY;
+# There are unfortunately only MyISAM and MEMORY all time available
+# Therefore use here MEMORY again.
+let $other_engine_type1= MEMORY;
+let $other_non_trans_engine_type= MEMORY;
+let $other_non_live_chks_engine_type= MEMORY;
+# Therefore use here MyISAM again.
+let $other_live_chks_engine_type= MyISAM;
 # MyISAM does not support transactions
 let $test_transactions= 0;
 # MyISAM does not support FOREIGN KEYFOREIGN KEYs
diff --git a/mysql-test/t/read_many_rows_innodb.test b/mysql-test/t/read_many_rows_innodb.test
index 0f24dcf92bf..ed86275447f 100644
--- a/mysql-test/t/read_many_rows_innodb.test
+++ b/mysql-test/t/read_many_rows_innodb.test
@@ -12,5 +12,6 @@
 
 --source include/have_innodb.inc
 let $engine_type= InnoDB;
+let $other_engine_type= MyISAM;
 
 --source include/read_many_rows.inc