diff options
| author | unknown <brian@zim.(none)> | 2006-08-14 16:50:52 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-14 16:50:52 -0700 |
| commit | 0c96f52f4e94470b668f7b7bf320c85cdac86622 (patch) | |
| tree | 14c1a2bad3a9939f11287913b27ada79c1d3342c | |
| parent | f7c3f65a803ff705cd2c409cef26a1af0b80c797 (diff) | |
| download | mariadb-git-0c96f52f4e94470b668f7b7bf320c85cdac86622.tar.gz | |
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
| -rw-r--r-- | mysql-test/r/mysqldump.result | 7 | ||||
| -rw-r--r-- | mysql-test/r/repair.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/mysqldump.test | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index e7573ba48d9..3b4f223afbf 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -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); diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result index 9b07281aa7b..c93291be836 100644 --- a/mysql-test/r/repair.result +++ b/mysql-test/r/repair.result @@ -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; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index c175804c0cd..1f31c84ba68 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -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 |