Commit 7260fd70 authored by unknown's avatar unknown
Browse files

Merge fixes 


mysql-test/r/mysqldump.result:
  Merge result fix
mysql-test/r/repair.result:
  Merge Result Fix
mysql-test/t/mysqldump.test:
  Fix of test
parent 948a8943

mysql-test/r/mysqldump.result

+0 −7
Original line number Diff line number Diff line
@@ -2923,15 +2923,8 @@ grant RELOAD on *.* to mysqltest_1@localhost; 
mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227)

mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227)

grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;

CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=537;

CREATE TABLE `t1` (

  `a` int(11) default NULL,

  `b` varchar(34) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

drop table t1;

drop user mysqltest_1@localhost;

drop table t1;

drop user mysqltest_1;

End of 5.0 tests

create table t1 (a text , b text);

create table t2 (a text , b text);

mysql-test/r/repair.result

+6 −0
Original line number Diff line number Diff line
@@ -52,3 +52,9 @@ Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_par 
t1	1	a	1	a	A	5	NULL	NULL	YES	BTREE	

SET myisam_repair_threads=@@global.myisam_repair_threads;

DROP TABLE t1;

DROP TABLE IF EXISTS tt1;

CREATE TEMPORARY TABLE tt1 (c1 INT);

REPAIR TABLE tt1 USE_FRM;

Table	Op	Msg_type	Msg_text

tt1	repair	error	Cannot repair temporary table from .frm file

DROP TABLE tt1;

mysql-test/t/mysqldump.test

+0 −1
Original line number Diff line number Diff line
@@ -1325,7 +1325,6 @@ grant REPLICATION CLIENT on *.* to mysqltest_1@localhost; 
# Clean up

drop table t1;

drop user mysqltest_1@localhost;

drop user mysqltest_1;



--echo End of 5.0 tests