diff options
| author | unknown <brian@zim.(none)> | 2006-08-14 09:45:41 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-14 09:45:41 -0700 |
| commit | 61d5563ba413c18b2674e97016093c082b9918d0 (patch) | |
| tree | 529a4de4c79b61d082700c7ca2a594f5755d4eb1 /mysql-test/t | |
| parent | ba8be73946c35852cf296c2d30bbf2a0fe06f87f (diff) | |
| parent | 492e7b081168f1922ef6409ebba77dbf30638185 (diff) | |
| download | mariadb-git-61d5563ba413c18b2674e97016093c082b9918d0.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/brian/mysql/dep-5.0
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/mysqldump.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/repair.test | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 4cdfabd4484..848c5360db7 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1273,7 +1273,7 @@ drop database mysqldump_dbb; use test; # Create user without sufficient privs to perform the requested operation -create user mysqltest_1; +create user mysqltest_1@localhost; create table t1(a int, b varchar(34)); # To get consistent output, reset the master, starts over from first log @@ -1308,4 +1308,4 @@ grant REPLICATION CLIENT on *.* to mysqltest_1@localhost; # Clean up drop table t1; -drop user mysqltest_1; +drop user mysqltest_1@localhost; diff --git a/mysql-test/t/repair.test b/mysql-test/t/repair.test index 16e1d76d460..91a7442226a 100644 --- a/mysql-test/t/repair.test +++ b/mysql-test/t/repair.test @@ -34,4 +34,15 @@ repair table t1; repair table t1 use_frm; drop table t1; +# +# BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1 +# +CREATE TABLE t1(a INT, KEY(a)); +INSERT INTO t1 VALUES(1),(2),(3),(4),(5); +SET myisam_repair_threads=2; +REPAIR TABLE t1; +SHOW INDEX FROM t1; +SET myisam_repair_threads=@@global.myisam_repair_threads; +DROP TABLE t1; + # End of 4.1 tests |