Commit f6115fb4 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
parents a5d9932b a19fdb2b

mysql-test/lib/mtr_cases.pl

+42 −0
Original line number Diff line number Diff line
@@ -455,6 +455,16 @@ sub collect_one_test_case($$$$$$$) { 
        "Test case '$tname' is skipped.");

    }

  }

  else

  {

    mtr_options_from_test_file($tinfo,"$testdir/${tname}.test");



    if ( ! $tinfo->{'innodb_test'} )

    {

      # mtr_report("Adding '--skip-innodb' to $tinfo->{'name'}");

      push(@{$tinfo->{'master_opt'}}, "--skip-innodb");

    }

  }



  # We can't restart a running server that may be in use
@@ -463,7 +473,39 @@ sub collect_one_test_case($$$$$$$) { 
  {

    $tinfo->{'skip'}= 1;

  }



}



sub mtr_options_from_test_file($$$) {

  my $tinfo= shift;

  my $file= shift;



  open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!");

  my @args;

  while ( <FILE> )

  {

    chomp;



    # Check if test uses innodb

    if ( defined mtr_match_substring($_,"include/have_innodb.inc"))

    {

      $tinfo->{'innodb_test'} = 1;

    }



    # If test sources another file, open it as well

    my $value= mtr_match_prefix($_, "--source");

    if ( defined $value)

    {

      $value=~ s/^\s+//;  # Remove leading space

      $value=~ s/\s+$//;  # Remove ending space



      my $sourced_file= "$::glob_mysql_test_dir/$value";

      mtr_options_from_test_file($tinfo, $sourced_file);

    }



  }

  close FILE;



}



1;

mysql-test/mysql-test-run.pl

+11 −0
Original line number Diff line number Diff line
@@ -876,6 +876,7 @@ sub command_line_setup () { 
   start_timeout =>  400, # enough time create innodb tables



   ndbcluster    =>  1, # ndbcluster not started

   master_opt    => [],

  };



  $master->[1]=
@@ -2143,6 +2144,14 @@ sub run_testcase ($) { 
    {

      $do_restart= 1;

    }

    # Check that running master was started with same options

    # as the current test requires

    elsif (! mtr_same_opts($master->[0]->{'master_opt'},

			   $tinfo->{'master_opt'}) )

    {

      $do_restart= 1;

    }





    if ( $do_restart )

    {
@@ -2222,6 +2231,8 @@ sub run_testcase ($) { 
          report_failure_and_restart($tinfo);

          return;

        }

	# Remember options used to start

	$master->[0]->{'master_opt'}= $tinfo->{'master_opt'};

      }

      if ( $using_ndbcluster_master and ! $master->[1]->{'pid'} )

      {

mysql-test/r/create.result

+0 −6
Original line number Diff line number Diff line
@@ -772,9 +772,3 @@ t1 CREATE TABLE `t1` ( 
  `i` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295

drop table t1;
 
create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

character set utf8 collate utf8_general_ci;

Warnings:

Warning	1071	Specified key was too long; max key length is 765 bytes

insert into t1 values('aaa');

drop table t1;

mysql-test/r/innodb_mysql.result

+6 −0
Original line number Diff line number Diff line
@@ -54,3 +54,9 @@ c.c_id = 218 and expiredate is null; 
slai_id

12

drop table t1, t2;

create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

character set utf8 collate utf8_general_ci;

Warnings:

Warning	1071	Specified key was too long; max key length is 765 bytes

insert into t1 values('aaa');

drop table t1;

mysql-test/r/partition.result

+0 −5
Original line number Diff line number Diff line
@@ -643,11 +643,6 @@ partition by list (a) 
alter table t1 rebuild partition;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

drop table t1;

create table t1 (a int) engine=innodb partition by hash(a) ;

show table status like 't1';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	InnoDB	10	Compact	2	8192	16384	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

drop table t1;

create table t2 (s1 int not null auto_increment, primary key (s1)) partition by list (s1) (partition p1 values in (1),partition p2 values in (2),partition p3 values in (3),partition p4 values in (4));

insert into t2 values (null),(null),(null);

select * from t2;