Commit 73fe16cb authored by dkatz@damien-katzs-computer.local's avatar dkatz@damien-katzs-computer.local
Browse files

Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  damien-katzs-computer.local:/Users/dkatz/mysql50
parents b578abc0 e267f900

mysql-test/include/have_lowercase1.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--require r/lowercase1.require

--disable_query_log

show variables like 'lower_case_table_names';

--enable_query_log

mysql-test/lib/mtr_report.pl

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ sub mtr_report_stats ($) { 
  }

  if (!$::opt_extern)

  {

    print "The servers where restarted $tot_restarts times\n";

    print "The servers were restarted $tot_restarts times\n";

  }



  if ( $::opt_timer )
@@ -357,7 +357,7 @@ sub mtr_report_stats ($) { 


  if ( $tot_failed != 0 || $found_problems)

  {

    mtr_error("there where failing test cases");

    mtr_error("there were failing test cases");

  }

}

mysql-test/r/lowercase1.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value

lower_case_table_names	1

mysql-test/r/lowercase_mixed_tmpdir.result

0 → 100644
+6 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (id int) engine=myisam;

insert into t1 values (1);

create temporary table t2 select * from t1;

drop temporary table t2;

drop table t1;

mysql-test/t/lowercase_mixed_tmpdir-master.opt

0 → 100644
+2 −0
Original line number Diff line number Diff line 
--lower-case-table-names=1

--tmpdir=$MYSQLTEST_VARDIR/tmp/MixedCase