MDEV-12756 rpl.rpl_killed_ddl fails in buildbot with 'Can't find record'

montywi · montywi · commit f7dab76aa286 · 2017-05-17T00:00:27.000+03:00
The issue was that my_errno was not set properly when a repair was killed,
which confused the rpl_killed_ddl script.

I also added an extra test line in varchar.inc to ensure we don't give
duplicate error rows.
diff --git a/mysql-test/include/varchar.inc b/mysql-test/include/varchar.inc
@@ -90,6 +90,7 @@ explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  '
 --replace_regex /Duplicate entry '[^']+' for key/Duplicate entry '{ ' for key/
 --error ER_DUP_ENTRY
 alter table t1 add unique(v);
+show warnings;
 alter table t1 add key(v);
 select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a';
 --replace_column 6 # 9 # 10 #
diff --git a/mysql-test/r/mix2_myisam.result b/mysql-test/r/mix2_myisam.result
@@ -1549,6 +1549,9 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	v	v	13	const	#	Using where; Using index
 alter table t1 add unique(v);
 ERROR 23000: Duplicate entry '{ ' for key 'v_2'
+show warnings;
+Level	Code	Message
+Error	1062	Duplicate entry 'a' for key 'v_2'
 alter table t1 add key(v);
 Warnings:
 Note	1831	Duplicate index `v_2`. This is deprecated and will be disallowed in a future release
diff --git a/mysql-test/r/mrr_icp_extra.result b/mysql-test/r/mrr_icp_extra.result
@@ -350,6 +350,9 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	v	v	13	const	#	Using where; Using index
 alter table t1 add unique(v);
 ERROR 23000: Duplicate entry '{ ' for key 'v_2'
+show warnings;
+Level	Code	Message
+Error	1062	Duplicate entry 'a' for key 'v_2'
 alter table t1 add key(v);
 Warnings:
 Note	1831	Duplicate index `v_2`. This is deprecated and will be disallowed in a future release
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
@@ -1255,6 +1255,9 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	v	v	13	const	#	Using where; Using index
 alter table t1 add unique(v);
 ERROR 23000: Duplicate entry '{ ' for key 'v_2'
+show warnings;
+Level	Code	Message
+Error	1062	Duplicate entry 'a' for key 'v_2'
 alter table t1 add key(v);
 Warnings:
 Note	1831	Duplicate index `v_2`. This is deprecated and will be disallowed in a future release
diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
@@ -1917,6 +1917,9 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	v	v	13	const	#	Using where; Using index
 alter table t1 add unique(v);
 ERROR 23000: Duplicate entry '{ ' for key 'v_2'
+show warnings;
+Level	Code	Message
+Error	1062	Duplicate entry 'v' for key 'v_2'
 alter table t1 add key(v);
 Warnings:
 Note	1831	Duplicate index `v_2`. This is deprecated and will be disallowed in a future release
diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result
@@ -1145,6 +1145,9 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	v	v	13	const	#	Using where; Using index
 alter table t1 add unique(v);
 ERROR 23000: Duplicate entry '{ ' for key 'v_2'
+show warnings;
+Level	Code	Message
+Error	1062	Duplicate entry 'a' for key 'v_2'
 alter table t1 add key(v);
 Warnings:
 Note	1831	Duplicate index `v_2`. This is deprecated and will be disallowed in a future release
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
@@ -9938,7 +9938,9 @@ copy_data_between_tables(THD *thd, TABLE *from, TABLE *to,
   }
   if (to->file->ha_end_bulk_insert() && error <= 0)
   {
-    to->file->print_error(my_errno,MYF(0));
+    /* Give error, if not already given */
+    if (!thd->is_error())
+      to->file->print_error(my_errno,MYF(0));
     error= 1;
   }
   to->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
@@ -834,7 +834,10 @@ extern "C" {
 
 int _ma_killed_ptr(HA_CHECK *param)
 {
-  return thd_killed((THD*)param->thd);
+  if (likely(thd_killed((THD*)param->thd)) == 0)
+    return 0;
+  my_errno= HA_ERR_ABORTED_BY_USER;
+  return 1;
 }
 
 
@@ -1668,8 +1671,11 @@ int ha_maria::repair(THD *thd, HA_CHECK *param, bool do_optimize)
       }
       if (error && file->create_unique_index_by_sort && 
           share->state.dupp_key != MAX_KEY)
+      {
+        my_errno= HA_ERR_FOUND_DUPP_KEY;
         print_keydup_error(table, &table->key_info[share->state.dupp_key], 
                            MYF(0));
+      }
     }
     else
     {
diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c
@@ -1364,6 +1364,7 @@ static int check_dynamic_record(HA_CHECK *param, MARIA_HA *info, int extend,
         pos=block_info.filepos+block_info.block_len;
         if (block_info.rec_len > (uint) share->base.max_pack_length)
         {
+          my_errno= HA_ERR_WRONG_IN_RECORD;
           _ma_check_print_error(param,"Found too long record (%lu) at %s",
                                 (ulong) block_info.rec_len,
                                 llstr(start_recpos,llbuff));
@@ -4995,6 +4996,7 @@ static int sort_get_next_record(MARIA_SORT_PARAM *sort_param)
 	  param->error_printed=1;
           param->retry_repair=1;
           param->testflag|=T_RETRY_WITHOUT_QUICK;
+          my_errno= HA_ERR_WRONG_IN_RECORD;
 	  DBUG_RETURN(1);	/* Something wrong with data */
 	}
 	b_type= _ma_get_block_info(info, &block_info,-1,pos);
@@ -5268,6 +5270,7 @@ static int sort_get_next_record(MARIA_SORT_PARAM *sort_param)
 	param->error_printed=1;
         param->retry_repair=1;
         param->testflag|=T_RETRY_WITHOUT_QUICK;
+        my_errno= HA_ERR_WRONG_IN_RECORD;
 	DBUG_RETURN(1);		/* Something wrong with data */
       }
       sort_param->start_recpos=sort_param->pos;
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
@@ -577,7 +577,10 @@ extern "C" {
 
 int killed_ptr(HA_CHECK *param)
 {
-  return thd_killed((THD*)param->thd);
+  if (likely(thd_killed((THD*)param->thd)) == 0)
+    return 0;
+  my_errno= HA_ERR_ABORTED_BY_USER;
+  return 1;
 }
 
 void mi_check_print_error(HA_CHECK *param, const char *fmt,...)
@@ -1213,6 +1216,11 @@ int ha_myisam::repair(THD *thd, HA_CHECK &param, bool do_optimize)
     if (remap)
       mi_munmap_file(file);
 #endif
+    /*
+      The following is to catch errors when my_errno is no set properly
+      during repairt
+    */
+    my_errno= 0;
     if (mi_test_if_sort_rep(file,file->state->records,tmp_key_map,0) &&
 	(local_testflag & T_REP_BY_SORT))
     {
@@ -1235,8 +1243,11 @@ int ha_myisam::repair(THD *thd, HA_CHECK &param, bool do_optimize)
       }
       if (error && file->create_unique_index_by_sort && 
           share->state.dupp_key != MAX_KEY)
+      {
+        my_errno= HA_ERR_FOUND_DUPP_KEY;
         print_keydup_error(table, &table->key_info[share->state.dupp_key],
                            MYF(0));
+      }
     }
     else
     {
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
@@ -3126,6 +3126,7 @@ static int sort_key_read(MI_SORT_PARAM *sort_param, void *key)
   }
   if (info->state->records == sort_info->max_records)
   {
+    my_errno= HA_ERR_WRONG_IN_RECORD;
     mi_check_print_error(sort_info->param,
 			 "Key %d - Found too many records; Can't continue",
                          sort_param->key+1);
@@ -3332,6 +3333,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
 	  param->error_printed=1;
           param->retry_repair=1;
           param->testflag|=T_RETRY_WITHOUT_QUICK;
+          my_errno= HA_ERR_WRONG_IN_RECORD;
 	  DBUG_RETURN(1);	/* Something wrong with data */
 	}
 	b_type=_mi_get_block_info(&block_info,-1,pos);
@@ -3590,6 +3592,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
 	param->error_printed=1;
         param->retry_repair=1;
         param->testflag|=T_RETRY_WITHOUT_QUICK;
+        my_errno= HA_ERR_WRONG_IN_RECORD;
 	DBUG_RETURN(1);		/* Something wrong with data */
       }
       sort_param->start_recpos=sort_param->pos;

Original file line number	Diff line number	Diff line change
`@@ -9938,7 +9938,9 @@ copy_data_between_tables(THD thd, TABLE from, TABLE *to,`
`9938`	`9938`	`}`
`9939`	`9939`	`if (to->file->ha_end_bulk_insert() && error <= 0)`
`9940`	`9940`	`{`
`9941`		`- to->file->print_error(my_errno,MYF(0));`
	`9941`	`+ /* Give error, if not already given */`
	`9942`	`+ if (!thd->is_error())`
	`9943`	`+ to->file->print_error(my_errno,MYF(0));`
`9942`	`9944`	`error= 1;`
`9943`	`9945`	`}`
`9944`	`9946`	`to->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);`
Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,10 @@ extern "C" {`
`834`	`834`
`835`	`835`	`int _ma_killed_ptr(HA_CHECK *param)`
`836`	`836`	`{`
`837`		`- return thd_killed((THD*)param->thd);`
	`837`	`+ if (likely(thd_killed((THD*)param->thd)) == 0)`
	`838`	`+ return 0;`
	`839`	`+ my_errno= HA_ERR_ABORTED_BY_USER;`
	`840`	`+ return 1;`
`838`	`841`	`}`
`839`	`842`
`840`	`843`
`@@ -1668,8 +1671,11 @@ int ha_maria::repair(THD thd, HA_CHECK param, bool do_optimize)`
`1668`	`1671`	`}`
`1669`	`1672`	`if (error && file->create_unique_index_by_sort &&`
`1670`	`1673`	`share->state.dupp_key != MAX_KEY)`
	`1674`	`+ {`
	`1675`	`+ my_errno= HA_ERR_FOUND_DUPP_KEY;`
`1671`	`1676`	`print_keydup_error(table, &table->key_info[share->state.dupp_key],`
`1672`	`1677`	`MYF(0));`
	`1678`	`+ }`
`1673`	`1679`	`}`
`1674`	`1680`	`else`
`1675`	`1681`	`{`
Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,10 @@ extern "C" {`
`577`	`577`
`578`	`578`	`int killed_ptr(HA_CHECK *param)`
`579`	`579`	`{`
`580`		`- return thd_killed((THD*)param->thd);`
	`580`	`+ if (likely(thd_killed((THD*)param->thd)) == 0)`
	`581`	`+ return 0;`
	`582`	`+ my_errno= HA_ERR_ABORTED_BY_USER;`
	`583`	`+ return 1;`
`581`	`584`	`}`
`582`	`585`
`583`	`586`	`void mi_check_print_error(HA_CHECK param, const char fmt,...)`
`@@ -1213,6 +1216,11 @@ int ha_myisam::repair(THD *thd, HA_CHECK &param, bool do_optimize)`
`1213`	`1216`	`if (remap)`
`1214`	`1217`	`mi_munmap_file(file);`
`1215`	`1218`	`#endif`
	`1219`	`+ /*`
	`1220`	`+ The following is to catch errors when my_errno is no set properly`
	`1221`	`+ during repairt`
	`1222`	`+ */`
	`1223`	`+ my_errno= 0;`
`1216`	`1224`	`if (mi_test_if_sort_rep(file,file->state->records,tmp_key_map,0) &&`
`1217`	`1225`	`(local_testflag & T_REP_BY_SORT))`
`1218`	`1226`	`{`
`@@ -1235,8 +1243,11 @@ int ha_myisam::repair(THD *thd, HA_CHECK &param, bool do_optimize)`
`1235`	`1243`	`}`
`1236`	`1244`	`if (error && file->create_unique_index_by_sort &&`
`1237`	`1245`	`share->state.dupp_key != MAX_KEY)`
	`1246`	`+ {`
	`1247`	`+ my_errno= HA_ERR_FOUND_DUPP_KEY;`
`1238`	`1248`	`print_keydup_error(table, &table->key_info[share->state.dupp_key],`
`1239`	`1249`	`MYF(0));`
	`1250`	`+ }`
`1240`	`1251`	`}`
`1241`	`1252`	`else`
`1242`	`1253`	`{`