Commit c6255402 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work.mysql.com:/home/bk/mysql 

into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents f4df5cd2 46400961

mysql-test/mysql-test-run

+5 −2
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ start_master() 


start_slave()

{

    [ x$SKIP_SLAVE = x1 ] && return

    [ -d $GCOV_SLAVE_SRC ] && cd $GCOV_SLAVE_SRC

    slave_args="--no-defaults --server-id=2 \

	    --master-user=root \
@@ -362,7 +363,7 @@ run_testcase () 
 tname=`$ECHO $tname | $CUT -d . -f 1`

 master_opt_file=$TESTDIR/$tname-master.opt

 slave_opt_file=$TESTDIR/$tname-slave.opt



 SKIP_SLAVE=`$EXPR \( match $tname rpl \) = 0`

 

 if [ -f $master_opt_file ] ;

 then
@@ -443,7 +444,9 @@ run_testcase () 


mysql_install_db



if [ -z $DO_GDB ]

#do not automagically start deamons if we are in gdb or running only one test

#case

if [ -z $DO_GDB ] && [ -z $1 ]

then

 $SETCOLOR_NORMAL && $ECHO -n "Starting mysqld for Testing" 

 mysql_start

mysql-test/r/3.23/alt000001.result

0 → 100644
+5 −0
Original line number Diff line number Diff line 
n	

3	

9	

10	

12

mysql-test/r/3.23/rpl000010.result

0 → 100644
+3 −0
Original line number Diff line number Diff line 
n	

1	

2

mysql-test/t/3.23/alt000001.test

0 → 100644
+6 −0
Original line number Diff line number Diff line 
use test;

drop table if exists x;

create table x (n int);

insert into x values(9),(3),(12),(10);

alter table x order by n;

@r/3.23/alt000001.result select * from x;

mysql-test/t/3.23/rpl000010-slave.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--disconnect-slave-event-count=1