diff options
| author | unknown <istruewing@stella.local> | 2007-11-14 14:42:11 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-11-14 14:42:11 +0100 |
| commit | 3160957ebfea0b2caafd226c3eab7fe11d9b242e (patch) | |
| tree | 89af875f87950fccca63c9cf5cc62564e085246d | |
| parent | 09e24d1337c2c46bfb5bfaeb7e051f502d8d6bdc (diff) | |
| parent | 706a8b09ae1c208adcf79d19309fcf8127973b63 (diff) | |
| download | mariadb-git-3160957ebfea0b2caafd226c3eab7fe11d9b242e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into stella.local:/home2/mydev/mysql-5.0-bug4692
myisam/mi_check.c:
Auto merged
| -rw-r--r-- | myisam/mi_check.c | 2 | ||||
| -rw-r--r-- | mysql-test/r/myisam.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/myisam.test | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 7442693d901..420bc974752 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -1487,7 +1487,7 @@ static int mi_drop_all_indexes(MI_CHECK *param, MI_INFO *info, my_bool force) /* Remove all key blocks of this index file from key cache. */ if ((error= flush_key_blocks(share->key_cache, share->kfile, FLUSH_IGNORE_CHANGED))) - goto end; + goto end; /* purecov: inspected */ /* Clear index root block pointers. */ for (i= 0; i < share->base.keys; i++) diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 176d0e97012..56933f45fbf 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -1830,5 +1830,13 @@ 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 diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index ad223dc2664..80c7a92c12f 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -1185,6 +1185,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 |