WL#14938: Remove multi-threaded myisam repair

RB#27618 the 5.7 version

Author: gkodinov

include/my_check_opt.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2021, Oracle and/or its affiliates.
+/* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License, version 2.0,
@@ -54,7 +54,7 @@ extern "C" {
 #define T_READONLY(1UL << 16)
 #define T_REP(1UL << 17)
 #define T_REP_BY_SORT(1UL << 18)
-#define T_REP_PARALLEL(1UL << 19)
+#define T_REP_PARALLEL_OBSOLETE(1UL << 19)
 #define T_RETRY_WITHOUT_QUICK(1UL << 20)
 #define T_SAFE_REPAIR(1UL << 21)
 #define T_SILENT(1UL << 22)
@@ -68,7 +68,7 @@ extern "C" {
 #define T_WAIT_FOREVER(1UL << 30)
 #define T_WRITE_LOOP(1UL << 31)
 
-#define T_REP_ANY(T_REP | T_REP_BY_SORT | T_REP_PARALLEL)
+#define T_REP_ANY(T_REP | T_REP_BY_SORT)
 
 #ifdef__cplusplus
 }

include/myisam.h

@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2000, 2021, Oracle and/or its affiliates.
+ Copyright (c) 2000, 2022, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License, version 2.0,
@@ -395,8 +395,6 @@ typedef struct st_mi_check_param
  const char *db_name, *table_name;
  const char *op_name;
  enum_mi_stats_method stats_method;
- mysql_mutex_t print_msg_mutex;
- my_bool need_print_msg_lock;
 } MI_CHECK;
 
 typedef struct st_sort_ft_buf
@@ -418,10 +416,6 @@ typedef struct st_sort_info
  uchar *buff;
  SORT_KEY_BLOCKS *key_block,*key_block_end;
  SORT_FT_BUF *ft_buf;
- /* sync things */
- uint got_error, threads_running;
- mysql_mutex_t mutex;
- mysql_cond_t cond;
 } SORT_INFO;
 
 /* functions in mi_check */
@@ -437,8 +431,6 @@ int mi_sort_index(MI_CHECK *param, MI_INFO *info, char * name,
  my_bool no_copy_stat);
 int mi_repair_by_sort(MI_CHECK *param, MI_INFO *info,
  const char * name, int rep_quick, my_bool no_copy_stat);
-int mi_repair_parallel(MI_CHECK *param, MI_INFO *info,
- const char * name, int rep_quick, my_bool no_copy_stat);
 int change_to_newfile(const char * filename, const char * old_ext,
  const char * new_ext, myf myflags);
 int lock_file(MI_CHECK *param, File file, my_off_t start, int lock_type,

mysql-test/r/fulltext.result

@@ -459,13 +459,9 @@ COUNT(*)
 DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(30), FULLTEXT(a));
 INSERT INTO t1 VALUES('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
-SET myisam_repair_threads=2;
-Warnings:
-Warning	1681	'@@myisam_repair_threads' is deprecated and will be removed in a future release.
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
-SET myisam_repair_threads=@@global.myisam_repair_threads;
 INSERT INTO t1 VALUES('testword\'\'');
 SELECT a FROM t1 WHERE MATCH a AGAINST('testword' IN BOOLEAN MODE);
 a

mysql-test/r/myisam.result

@@ -827,12 +827,6 @@ a	b
 xxxxxxxxx	bbbbbb
 xxxxxxxxx	bbbbbb
 DROP TABLE t1;
-SET @@myisam_repair_threads=2;
-Warnings:
-Warning	1681	'@@myisam_repair_threads' is deprecated and will be removed in a future release.
-SHOW VARIABLES LIKE 'myisam_repair%';
-Variable_name	Value
-myisam_repair_threads	2
 CREATE TABLE t1 (
 `_id` int(11) NOT NULL default '0',
 `url` text,
@@ -951,10 +945,6 @@ _id
 8
 9
 DROP TABLE t1;
-SET @@myisam_repair_threads=1;
-SHOW VARIABLES LIKE 'myisam_repair%';
-Variable_name	Value
-myisam_repair_threads	1
 CREATE TABLE t1(a VARCHAR(16));
 INSERT INTO t1 VALUES('aaaaaaaa'),(NULL);
 UPDATE t1 AS ta1, t1 AS ta2 SET ta1.a='aaaaaaaaaaaaaaaa';
@@ -1890,12 +1880,8 @@ 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;
-Warnings:
-Warning	1681	'@@myisam_repair_threads' is deprecated and will be removed in a future release.
 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
@@ -2413,11 +2399,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	repair	error	myisam_sort_buffer_size is too small
 test.t1	repair	warning	Number of rows changed from 0 to 7168
 test.t1	repair	status	OK
-SET myisam_repair_threads=2;
-Warnings:
-Warning	1681	'@@myisam_repair_threads' is deprecated and will be removed in a future release.
 REPAIR TABLE t1;
-SET myisam_repair_threads=@@global.myisam_repair_threads;
 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
@@ -2489,30 +2471,6 @@ a	a
 1	1
 DROP TABLE t1;
 #
-# BUG#47444 - --myisam_repair_threads>1can result in all index
-# cardinalities=1
-#
-SET myisam_repair_threads=2;
-Warnings:
-Warning	1681	'@@myisam_repair_threads' is deprecated and will be removed in a future release.
-SET myisam_sort_buffer_size=4096;
-CREATE TABLE t1(a CHAR(255), KEY(a), KEY(a), KEY(a));
-Warnings:
-Warning	1831	Duplicate index 'a_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Warning	1831	Duplicate index 'a_3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-INSERT INTO t1 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9),(0),(1),(2),(3);
-REPAIR TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	repair	status	OK
-SELECT CARDINALITY FROM INFORMATION_SCHEMA.STATISTICS WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
-CARDINALITY
-14
-14
-14
-DROP TABLE t1;
-SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
-SET myisam_repair_threads=@@global.myisam_repair_threads;
-#
 # BUG#11757032 - 49030: OPTIMIZE TABLE BREAKS MYISAM TABLE WHEN
 # USING MYISAM_USE_MMAP ON WINDOWS
 #

mysql-test/r/mysqld--help-notwin.result

@@ -601,10 +601,6 @@ The following options may be given as the first argument:
  --myisam-recover-options[=name] 
  Syntax: myisam-recover-options[=option[,option...]],
  where option can be DEFAULT, BACKUP, FORCE, QUICK, or OFF
- --myisam-repair-threads=# 
- DEPRECATED. If larger than 1, when repairing a MyISAM
- table all indexes will be created in parallel, with one
- thread per index. The value of 1 disables parallel repair
  --myisam-sort-buffer-size=# 
  The buffer that is allocated when sorting the index when
  doing a REPAIR or when creating indexes with CREATE INDEX
@@ -1455,7 +1451,6 @@ myisam-data-pointer-size 6
 myisam-max-sort-file-size 9223372036853727232
 myisam-mmap-size 18446744073709551615
 myisam-recover-options OFF
-myisam-repair-threads 1
 myisam-sort-buffer-size 8388608
 myisam-stats-method nulls_unequal
 myisam-use-mmap FALSE

mysql-test/r/mysqld--help-win.result

@@ -591,10 +591,6 @@ The following options may be given as the first argument:
  --myisam-recover-options[=name] 
  Syntax: myisam-recover-options[=option[,option...]],
  where option can be DEFAULT, BACKUP, FORCE, QUICK, or OFF
- --myisam-repair-threads=# 
- DEPRECATED. If larger than 1, when repairing a MyISAM
- table all indexes will be created in parallel, with one
- thread per index. The value of 1 disables parallel repair
  --myisam-sort-buffer-size=# 
  The buffer that is allocated when sorting the index when
  doing a REPAIR or when creating indexes with CREATE INDEX
@@ -1453,7 +1449,6 @@ myisam-data-pointer-size 6
 myisam-max-sort-file-size 9223372036853727232
 myisam-mmap-size 18446744073709551615
 myisam-recover-options OFF
-myisam-repair-threads 1
 myisam-sort-buffer-size 8388608
 myisam-stats-method nulls_unequal
 myisam-use-mmap FALSE

mysql-test/r/repair.result

@@ -39,19 +39,6 @@ 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;
-CREATE TABLE t1(a INT, KEY(a));
-INSERT INTO t1 VALUES(1),(2),(3),(4),(5);
-SET myisam_repair_threads=2;
-Warnings:
-Warning	1681	'@@myisam_repair_threads' is deprecated and will be removed in a future release.
-REPAIR TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	repair	status	OK
-SHOW INDEX FROM t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	1	a	1	a	A	5	NULL	NULL	YES	BTREE
-SET myisam_repair_threads=@@global.myisam_repair_threads;
-DROP TABLE t1;
 CREATE TABLE t1(a INT);
 USE mysql;
 REPAIR TABLE test.t1 USE_FRM;
@@ -81,15 +68,11 @@ INSERT INTO t1 VALUES
 Warnings:
 Error	1034	myisam_sort_buffer_size is too small
 Error	1034	Number of rows changed from 0 to 157
-SET myisam_repair_threads=2;
-Warnings:
-Warning	1681	'@@myisam_repair_threads' is deprecated and will be removed in a future release.
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	error	myisam_sort_buffer_size is too small
 test.t1	repair	warning	Number of rows changed from 0 to 157
 test.t1	repair	status	OK
-SET myisam_repair_threads=@@global.myisam_repair_threads;
 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 DROP TABLE t1;
 CREATE TABLE t1(a CHAR(255), KEY(a));
@@ -111,13 +94,9 @@ INSERT INTO t1 VALUES
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
 ('0'),('0'),('0'),('0'),('0'),('0'),('0');
-SET myisam_repair_threads=2;
-Warnings:
-Warning	1681	'@@myisam_repair_threads' is deprecated and will be removed in a future release.
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
-SET myisam_repair_threads=@@global.myisam_repair_threads;
 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 DROP TABLE t1;
 End of 4.1 tests