diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/myisam.result | 3 | ||||
| -rw-r--r-- | mysql-test/r/repair.result (renamed from mysql-test/r/repair_part1.result) | 8 | ||||
| -rw-r--r-- | mysql-test/r/repair_part2.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/lowercase_table2.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/lowercase_table3.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/lowercase_table_qcache.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/myisam.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/repair.test (renamed from mysql-test/t/repair_part1.test) | 8 | ||||
| -rw-r--r-- | mysql-test/t/repair_part2-master.sh | 1 | ||||
| -rw-r--r-- | mysql-test/t/repair_part2.test | 7 |
10 files changed, 17 insertions, 25 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 340db24cb44..9a123729c4b 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -523,7 +523,8 @@ Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_par t1 1 a 1 a A 1000 NULL NULL YES BTREE alter table t1 engine=heap; alter table t1 disable keys; -ERROR HY000: Table storage engine for 't1' doesn't have this option +Warnings: +Note 1031 Table storage engine for 't1' doesn't have this option show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t1 1 a 1 a NULL NULL NULL NULL YES HASH diff --git a/mysql-test/r/repair_part1.result b/mysql-test/r/repair.result index 6dcec409ea6..2398e13b8e3 100644 --- a/mysql-test/r/repair_part1.result +++ b/mysql-test/r/repair.result @@ -28,3 +28,11 @@ repair table t1 use_frm; Table Op Msg_type Msg_text test.t1 repair error Table 'test.t1' doesn't exist create table t1 engine=myisam SELECT 1,"table 1"; +repair table t1; +Table Op Msg_type Msg_text +test.t1 repair error Can't open file: 't1.MYI' (errno: 130) +repair table t1 use_frm; +Table Op Msg_type Msg_text +test.t1 repair warning Number of rows changed from 0 to 1 +test.t1 repair status OK +drop table t1; diff --git a/mysql-test/r/repair_part2.result b/mysql-test/r/repair_part2.result deleted file mode 100644 index c9cf6c019f7..00000000000 --- a/mysql-test/r/repair_part2.result +++ /dev/null @@ -1,8 +0,0 @@ -repair table t1; -Table Op Msg_type Msg_text -test.t1 repair error Can't open file: 't1.MYI' (errno: 130) -repair table t1 use_frm; -Table Op Msg_type Msg_text -test.t1 repair warning Number of rows changed from 0 to 1 -test.t1 repair status OK -drop table t1; diff --git a/mysql-test/t/lowercase_table2.test b/mysql-test/t/lowercase_table2.test index 8f542a7af78..5c479391916 100644 --- a/mysql-test/t/lowercase_table2.test +++ b/mysql-test/t/lowercase_table2.test @@ -1,6 +1,6 @@ # # Test of --lower-case-table-names=2 -# (User has case insensitive file system and want's to preserve case of +# (User has case insensitive file system and wants to preserve case of # table names) # --source include/have_innodb.inc diff --git a/mysql-test/t/lowercase_table3.test b/mysql-test/t/lowercase_table3.test index 735a0b390f9..1753772ecc3 100644 --- a/mysql-test/t/lowercase_table3.test +++ b/mysql-test/t/lowercase_table3.test @@ -1,6 +1,6 @@ # # Test of force of lower-case-table-names=0 -# (User has case insensitive file system and want's to preserve case of +# (User has case insensitive file system and wants to preserve case of # table names) # diff --git a/mysql-test/t/lowercase_table_qcache.test b/mysql-test/t/lowercase_table_qcache.test index 7416de25e1d..5077a41402a 100644 --- a/mysql-test/t/lowercase_table_qcache.test +++ b/mysql-test/t/lowercase_table_qcache.test @@ -26,4 +26,4 @@ select * from MySQL.db; enable_result_log; show status like "Qcache_queries_in_cache"; -set GLOBAL query_cache_size=0;
\ No newline at end of file +set GLOBAL query_cache_size=0; diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index ea5895b8ea1..298a8b1b61b 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -498,7 +498,6 @@ show keys from t1; alter table t1 enable keys; show keys from t1; alter table t1 engine=heap; ---error 1031 alter table t1 disable keys; show keys from t1; drop table t1,t2; diff --git a/mysql-test/t/repair_part1.test b/mysql-test/t/repair.test index a2e186fd385..83a302e6f29 100644 --- a/mysql-test/t/repair_part1.test +++ b/mysql-test/t/repair.test @@ -27,8 +27,8 @@ drop table t1; # non-existent table repair table t1 use_frm; -# -# Create test table for repair2 -# The following must be last in this file - create table t1 engine=myisam SELECT 1,"table 1"; +system echo 1 > $MYSQL_TEST_DIR/var/master-data/test/t1.MYI ; +repair table t1; +repair table t1 use_frm; +drop table t1; diff --git a/mysql-test/t/repair_part2-master.sh b/mysql-test/t/repair_part2-master.sh deleted file mode 100644 index 964bde06c18..00000000000 --- a/mysql-test/t/repair_part2-master.sh +++ /dev/null @@ -1 +0,0 @@ -echo "1" > $MYSQL_TEST_DIR/var/master-data/test/t1.MYI diff --git a/mysql-test/t/repair_part2.test b/mysql-test/t/repair_part2.test deleted file mode 100644 index 8c27e382dff..00000000000 --- a/mysql-test/t/repair_part2.test +++ /dev/null @@ -1,7 +0,0 @@ -# -# This test starts with a crashed t1.MYI file left over from repair.test -# - -repair table t1; -repair table t1 use_frm; -drop table t1; |