diff options
| author | unknown <kent@mysql.com> | 2005-05-15 07:34:09 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-05-15 07:34:09 +0200 |
| commit | 657469bab80c56d97e375903c61c755103b36058 (patch) | |
| tree | 4d0dab35f5e542e2cd3056afe3a2dcca595a6305 | |
| parent | f4425b50e157cf35f89ed22043b8ffd5089abdae (diff) | |
| download | mariadb-git-657469bab80c56d97e375903c61c755103b36058.tar.gz | |
mysql-test-run.pl:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
init_db.sql:
Initial db updates
mysql-test/lib/init_db.sql:
Initial db updates
mysql-test/mysql-test-run.pl:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
| -rw-r--r-- | mysql-test/lib/init_db.sql | 5 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mysql-test/lib/init_db.sql b/mysql-test/lib/init_db.sql index 902af0b0842..6d5ec55a6ae 100644 --- a/mysql-test/lib/init_db.sql +++ b/mysql-test/lib/init_db.sql @@ -1,4 +1,5 @@ -USE mysql; +use mysql; +set table_type=myisam; CREATE TABLE db ( Host char(60) binary DEFAULT '' NOT NULL, @@ -193,7 +194,7 @@ INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES CREATE TABLE time_zone ( Time_zone_id int unsigned NOT NULL auto_increment, - Use_leap_seconds enum('Y','N') DEFAULT 'N' NOT NULL, + Use_leap_seconds enum('Y','N') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY TzId (Time_zone_id) ) engine=MyISAM CHARACTER SET utf8 diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 5a188dc6927..30e92e07da1 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1497,15 +1497,15 @@ sub run_testcase ($) { { mtr_report_test_passed($tinfo); } - elsif ( $res == 2 ) + elsif ( $res == 62 ) { # Testcase itself tell us to skip this one mtr_report_test_skipped($tinfo); } else { - # Test case failed - if ( $res > 2 ) + # Test case failed, if in control mysqltest returns 1 + if ( $res != 1 ) { mtr_tofile($path_timefile, "mysqltest returned unexpected code $res, " . @@ -2129,7 +2129,7 @@ sub run_mysqltest ($$) { mysqld_arguments($args,'master',0,$tinfo->{'master_opt'},[]); } - return mtr_run_test($exe_mysqltest,$args,$tinfo->{'path'},"",$path_timefile,""); + return mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,""); } ############################################################################## |