Commit 3f53fa14 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/init_db.sql:
  Auto merged
parents aa778612 657469ba

mysql-test/lib/init_db.sql

+3 −2
Original line number Diff line number Diff line 
USE mysql;

use mysql;

set table_type=myisam;



CREATE TABLE db (

  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 (

  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

mysql-test/mysql-test-run.pl

+4 −4
Original line number Diff line number Diff line
@@ -1494,15 +1494,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, " .
@@ -2126,7 +2126,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,"");

}



##############################################################################