Commit b114f4ef authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var 

into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_EE_err.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
  Auto merged
mysql-test/r/backup.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_loaddata_s.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_rewrt_db.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_000015-slave.sh:
  Auto merged
mysql-test/t/rpl_flushlog_loop-master.opt:
  Auto merged
mysql-test/t/rpl_flushlog_loop-master.sh:
  Auto merged
mysql-test/t/rpl_flushlog_loop-slave.opt:
  Auto merged
mysql-test/t/rpl_flushlog_loop-slave.sh:
  Auto merged
mysql-test/t/rpl_loaddata_s.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_rewrt_db.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/sp-destruct.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/user_var-binlog.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge 5.0 -> 5.1
mysql-test/r/binlog_stm_blackhole.result:
  Merge 5.0 -> 5.1
mysql-test/r/mysqltest.result:
  Merge 5.0 -> 5.1
mysql-test/r/rpl_loaddata.result:
  Merge 5.0 -> 5.1
mysql-test/r/rpl_loaddata_m.result:
  Merge 5.0 -> 5.1
mysql-test/r/rpl_stm_log.result:
  Merge 5.0 -> 5.1
mysql-test/r/rpl_timezone.result:
  Merge 5.0 -> 5.1
mysql-test/t/mysqlbinlog.test:
  Merge 5.0 -> 5.1
mysql-test/t/mysqlbinlog2.test:
  Merge 5.0 -> 5.1
mysql-test/t/mysqltest.test:
  Merge 5.0 -> 5.1
mysql-test/t/rpl_drop_db.test:
  Merge 5.0 -> 5.1
mysql-test/t/rpl_loaddata.test:
  Merge 5.0 -> 5.1
mysql-test/t/rpl_loaddata_m.test:
  Merge 5.0 -> 5.1
mysql-test/t/rpl_timezone.test:
  Merge 5.0 -> 5.1
mysql-test/t/trigger-compat.test:
  Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
  Merge 5.0 -> 5.1
parents ded8417d d40f7056

mysql-test/extra/binlog_tests/blackhole.test

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ insert into t1 values(1); 
insert ignore into t1 values(1);

replace into t1 values(100);

create table t2 (a varchar(200)) engine=blackhole;

load data infile '../../std_data/words.dat' into table t2;

load data infile '../std_data_ln/words.dat' into table t2;

alter table t1 add b int;

alter table t1 drop b;

create table t3 like t1;

mysql-test/extra/binlog_tests/ctype_ucs_binlog.test

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ show binlog events from 102; 
# absolutely need variables names to be quoted and strings to be

# escaped).

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 

drop table t2;



# End of 4.1 tests

mysql-test/extra/rpl_tests/rpl_EE_err.test

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


eval create table t1 (a int) engine=$engine_type;

flush tables;

system rm ./var/master-data/test/t1.MYI ;

system rm $MYSQLTEST_VARDIR/master-data/test/t1.MYI ;

drop table if exists t1;

save_master_pos;

connection slave;

mysql-test/extra/rpl_tests/rpl_log.test

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ create table t1(n int not null auto_increment primary key); 
insert into t1 values (NULL);

drop table t1;

create table t1 (word char(20) not null);

load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;

load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;

select count(*) from t1;

drop table t1;

--replace_result $VERSION VERSION

mysql-test/extra/rpl_tests/rpl_stm_000001.test

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
-- source include/master-slave.inc



create table t1 (word char(20) not null);

load data infile '../../std_data/words.dat' into table t1;

load data infile '../std_data_ln/words.dat' into table t1;

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval load data local infile '$MYSQL_TEST_DIR/std_data/words.dat' into table t1;

select * from t1 limit 10;