diff options
| author | unknown <istruewing@stella.local> | 2007-11-14 12:51:36 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-11-14 12:51:36 +0100 |
| commit | 7af006feefcbf2904396a43900b2023e9709fd45 (patch) | |
| tree | 1b533bd165fa5790312c8c37192da71742cea328 /mysql-test | |
| parent | b3a71e34487b69846553111448fa2b32c86176a9 (diff) | |
| parent | 706a8b09ae1c208adcf79d19309fcf8127973b63 (diff) | |
| download | mariadb-git-7af006feefcbf2904396a43900b2023e9709fd45.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.0-bug4692
into stella.local:/home2/mydev/mysql-5.1-bug4692
storage/myisam/mi_check.c:
Auto merged
mysql-test/r/myisam.result:
Manual merge from 5.0.
mysql-test/t/myisam.test:
Manual merge from 5.0.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/myisam.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/myisam.test | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 3125660643c..50fbe89db52 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -1818,6 +1818,14 @@ ALTER TABLE t1 ENABLE KEYS; SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment t1 MyISAM 10 Fixed 1 # # # 3072 # # # # # # # +# Enable keys with parallel repair +SET @@myisam_repair_threads=2; +ALTER TABLE t1 DISABLE KEYS; +ALTER TABLE t1 ENABLE KEYS; +SET @@myisam_repair_threads=1; +CHECK TABLE t1 EXTENDED; +Table Op Msg_type Msg_text +test.t1 check status OK DROP TABLE t1; End of 5.0 tests create table t1 (a int not null, key `a` (a) key_block_size=1024); diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index 6f24d84f4c0..43c40ab8966 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -1170,6 +1170,12 @@ SHOW TABLE STATUS LIKE 't1'; #--exec ls -log var/master-data/test/t1.MYI #--exec myisamchk -dvv var/master-data/test/t1.MYI #--exec myisamchk -iev var/master-data/test/t1.MYI +--echo # Enable keys with parallel repair +SET @@myisam_repair_threads=2; +ALTER TABLE t1 DISABLE KEYS; +ALTER TABLE t1 ENABLE KEYS; +SET @@myisam_repair_threads=1; +CHECK TABLE t1 EXTENDED; DROP TABLE t1; --echo End of 5.0 tests |