List:Commits« Previous MessageNext Message »
From:Vinay Fisrekar Date:February 2 2011 11:00am
Subject:bzr commit into mysql-5.1 branch (vinay.fisrekar:3572) Bug#59890
View as plain text  
#At file:///home/vinayf/WORK/mysql_all_version_eits/code/repo/code_review_for_func1/mysql-5.1/ based on revid:ole.john.aske@stripped

 3572 Vinay Fisrekar	2011-02-02
      Bug#59890 : Change funcs_1 suite tests to make them engine independent
      Modified tests to make them engine independent and increase InnoDB coverage

    modified:
      mysql-test/suite/funcs_1/r/is_schema_privileges.result
      mysql-test/suite/funcs_1/t/is_basics_mixed.test
      mysql-test/suite/funcs_1/t/is_column_privileges.test
      mysql-test/suite/funcs_1/t/is_columns.test
      mysql-test/suite/funcs_1/t/is_engines.test
      mysql-test/suite/funcs_1/t/is_events.test
      mysql-test/suite/funcs_1/t/is_schema_privileges.test
      mysql-test/suite/funcs_1/t/is_table_constraints.test
      mysql-test/suite/funcs_1/t/is_table_privileges.test
      mysql-test/suite/funcs_1/t/is_user_privileges.test
=== modified file 'mysql-test/suite/funcs_1/r/is_schema_privileges.result'
--- a/mysql-test/suite/funcs_1/r/is_schema_privileges.result	2008-03-07 19:18:14 +0000
+++ b/mysql-test/suite/funcs_1/r/is_schema_privileges.result	2011-02-02 11:00:23 +0000
@@ -62,7 +62,7 @@ CREATE DATABASE db_datadict_1;
 CREATE DATABASE db_datadict_2;
 CREATE DATABASE db_datadict_3;
 CREATE TABLE db_datadict_2.t1(f1 INT, f2 INT, f3 INT)
-ENGINE = MEMORY;
+ENGINE = <engine_type>;
 DROP   USER 'testuser1'@'localhost';
 CREATE USER 'testuser1'@'localhost';
 DROP   USER 'testuser2'@'localhost';

=== modified file 'mysql-test/suite/funcs_1/t/is_basics_mixed.test'
--- a/mysql-test/suite/funcs_1/t/is_basics_mixed.test	2009-06-09 16:09:16 +0000
+++ b/mysql-test/suite/funcs_1/t/is_basics_mixed.test	2011-02-02 11:00:23 +0000
@@ -28,7 +28,8 @@
 
 # $engine_type must point to storage engine which is all time available.
 # The fastest engine should be preferred.
-let $engine_type = MEMORY;
+#let $engine_type = MEMORY;
+--let $engine_type = `select @@storage_engine;`
 
 
 # The INFORMATION_SCHEMA database must exist.

=== modified file 'mysql-test/suite/funcs_1/t/is_column_privileges.test'
--- a/mysql-test/suite/funcs_1/t/is_column_privileges.test	2009-06-09 16:09:16 +0000
+++ b/mysql-test/suite/funcs_1/t/is_column_privileges.test	2011-02-02 11:00:23 +0000
@@ -20,7 +20,8 @@
 # privileges.
 --source include/not_embedded.inc
 
-let $engine_type       = MEMORY;
+#let $engine_type       = MEMORY;
+--let $engine_type = `select @@storage_engine;`
 let $other_engine_type = MyISAM;
 
 let $is_table = COLUMN_PRIVILEGES;

=== modified file 'mysql-test/suite/funcs_1/t/is_columns.test'
--- a/mysql-test/suite/funcs_1/t/is_columns.test	2009-06-09 16:09:16 +0000
+++ b/mysql-test/suite/funcs_1/t/is_columns.test	2011-02-02 11:00:23 +0000
@@ -20,7 +20,8 @@
 # privileges.
 --source include/not_embedded.inc
 
-let $engine_type       = MEMORY;
+#let $engine_type       = MEMORY;
+--let $engine_type = `select @@storage_engine;`
 let $other_engine_type = MyISAM;
 
 let $is_table = COLUMNS;

=== modified file 'mysql-test/suite/funcs_1/t/is_engines.test'
--- a/mysql-test/suite/funcs_1/t/is_engines.test	2008-06-18 17:23:55 +0000
+++ b/mysql-test/suite/funcs_1/t/is_engines.test	2011-02-02 11:00:23 +0000
@@ -20,7 +20,8 @@ if (`SELECT VERSION() LIKE '%embedded%'`
    --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
 }
 
-let $engine_type       = MEMORY;
+#let $engine_type       = MEMORY;
+--let $engine_type = `select @@storage_engine;`
 let $other_engine_type = MyISAM;
 
 let $is_table = ENGINES;

=== modified file 'mysql-test/suite/funcs_1/t/is_events.test'
--- a/mysql-test/suite/funcs_1/t/is_events.test	2008-06-18 17:23:55 +0000
+++ b/mysql-test/suite/funcs_1/t/is_events.test	2011-02-02 11:00:23 +0000
@@ -15,7 +15,8 @@ if (`SELECT VERSION() LIKE '%embedded%'`
    --skip Bug#37456 funcs_1: Several tests crash when used with embedded server
 }
 
-let $engine_type       = MEMORY;
+#let $engine_type       = MEMORY;
+--let $engine_type = `select @@storage_engine;`
 let $other_engine_type = MyISAM;
 
 let $is_table = EVENTS;

=== modified file 'mysql-test/suite/funcs_1/t/is_schema_privileges.test'
--- a/mysql-test/suite/funcs_1/t/is_schema_privileges.test	2009-06-09 16:09:16 +0000
+++ b/mysql-test/suite/funcs_1/t/is_schema_privileges.test	2011-02-02 11:00:23 +0000
@@ -20,7 +20,8 @@
 # privileges.
 --source include/not_embedded.inc
 
-let $engine_type       = MEMORY;
+#let $engine_type       = MEMORY;
+--let $engine_type = `select @@storage_engine;`
 let $other_engine_type = MyISAM;
 
 let $is_table = SCHEMA_PRIVILEGES;
@@ -92,6 +93,7 @@ DROP DATABASE IF EXISTS db_datadict_3;
 CREATE DATABASE db_datadict_1;
 CREATE DATABASE db_datadict_2;
 CREATE DATABASE db_datadict_3;
+--replace_result $engine_type <engine_type>
 eval
 CREATE TABLE db_datadict_2.t1(f1 INT, f2 INT, f3 INT)
 ENGINE = $engine_type;

=== modified file 'mysql-test/suite/funcs_1/t/is_table_constraints.test'
--- a/mysql-test/suite/funcs_1/t/is_table_constraints.test	2009-06-09 16:09:16 +0000
+++ b/mysql-test/suite/funcs_1/t/is_table_constraints.test	2011-02-02 11:00:23 +0000
@@ -20,7 +20,8 @@
 # privileges.
 --source include/not_embedded.inc
 
-let $engine_type       = MyISAM;
+#let $engine_type       = MyISAM;
+--let $engine_type = `select @@storage_engine;`
 
 let $is_table = TABLE_CONSTRAINTS;
 

=== modified file 'mysql-test/suite/funcs_1/t/is_table_privileges.test'
--- a/mysql-test/suite/funcs_1/t/is_table_privileges.test	2009-06-09 16:09:16 +0000
+++ b/mysql-test/suite/funcs_1/t/is_table_privileges.test	2011-02-02 11:00:23 +0000
@@ -20,7 +20,8 @@
 # privileges.
 --source include/not_embedded.inc
 
-let $engine_type       = MEMORY;
+#let $engine_type       = MEMORY;
+--let $engine_type = `select @@storage_engine;`
 let $other_engine_type = MyISAM;
 
 let $is_table = TABLE_PRIVILEGES;

=== modified file 'mysql-test/suite/funcs_1/t/is_user_privileges.test'
--- a/mysql-test/suite/funcs_1/t/is_user_privileges.test	2009-06-09 16:09:16 +0000
+++ b/mysql-test/suite/funcs_1/t/is_user_privileges.test	2011-02-02 11:00:23 +0000
@@ -20,7 +20,8 @@
 # privileges.
 --source include/not_embedded.inc
 
-let $engine_type       = MEMORY;
+#let $engine_type       = MEMORY;
+--let $engine_type = `select @@storage_engine;`
 let $other_engine_type = MyISAM;
 
 let $is_table = USER_PRIVILEGES;


Attachment: [text/bzr-bundle] bzr/vinay.fisrekar@sun.com-20110202110023-sp70q1w2bldrrtq1.bundle
Thread
bzr commit into mysql-5.1 branch (vinay.fisrekar:3572) Bug#59890Vinay Fisrekar2 Feb