database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1

Browse Source 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
This commit is contained in:
kent@mysql.com
2005-05-15 07:38:42 +02:00
parent bd70ce726b f37bdbe059
commit e2d7efb238
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/lib/init_db.sql
View File

@ -1,4 +1,5 @@
USE mysql; use mysql;
set table_type=myisam;
CREATE TABLE db ( CREATE TABLE db (
Host char(60) binary DEFAULT '' NOT NULL, Host char(60) binary DEFAULT '' NOT NULL,
@ -206,7 +207,7 @@ INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES
CREATE TABLE time_zone ( CREATE TABLE time_zone (
Time_zone_id int unsigned NOT NULL auto_increment, 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) PRIMARY KEY TzId (Time_zone_id)
) engine=MyISAM ) engine=MyISAM
CHARACTER SET utf8 CHARACTER SET utf8

8
mysql-test/mysql-test-run.pl
View File

@ -1494,15 +1494,15 @@ sub run_testcase ($) {
{ {
mtr_report_test_passed($tinfo); mtr_report_test_passed($tinfo);
} }
elsif ( $res == 2 ) elsif ( $res == 62 )
{ {
# Testcase itself tell us to skip this one # Testcase itself tell us to skip this one
mtr_report_test_skipped($tinfo); mtr_report_test_skipped($tinfo);
} }
else else
{ {
# Test case failed # Test case failed, if in control mysqltest returns 1
if ( $res > 2 ) if ( $res != 1 )
{ {
mtr_tofile($path_timefile, mtr_tofile($path_timefile,
"mysqltest returned unexpected code $res, " . "mysqltest returned unexpected code $res, " .
@ -2126,7 +2126,7 @@ sub run_mysqltest ($$) {
mysqld_arguments($args,'master',0,$tinfo->{'master_opt'},[]); 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,"");
} }
############################################################################## ##############################################################################