Merge 5.5->10.0-base

mysql-test/mysql-test-run.pl

@@ -4783,6 +4783,9 @@ sub extract_warning_lines ($$) {
      qr|Warning: io_setup\(\) failed|,
      qr|Warning: io_setup\(\) attempt|,
      qr|setrlimit could not change the size of core files to 'infinity';|,
+     qr|feedback plugin: failed to retrieve the MAC address|,
+     qr|Plugin 'FEEDBACK' init function returned error|,
+     qr|Plugin 'FEEDBACK' registration as a INFORMATION SCHEMA failed|,
     );
 
   my $matched_lines= [];

mysql-test/r/myisam-metadata.result

@@ -5,7 +5,10 @@ a VARCHAR(100),
 INDEX(a)
 ) ENGINE=MyISAM;
 ALTER TABLE t1 DISABLE KEYS;
+SET debug_sync= 'myisam_after_repair_by_sort SIGNAL waiting WAIT_FOR go';
 ALTER TABLE t1 ENABLE KEYS;
+SET debug_sync= 'now WAIT_FOR waiting';
+SET debug_sync= 'now SIGNAL go';
 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	Dynamic	100000	27	#	#	#	0	NULL	#	#	#	latin1_swedish_ci	NULL		

mysql-test/suite/innodb/t/innodb_bug51920.test

@@ -36,7 +36,7 @@ let $wait_condition =
 # depending on platform.
 #
 connection con1;
--- error 1317, 2006, 2013
+-- error 1317, 2006, 2013, ER_CONNECTION_KILLED
 reap;
 connection default;
 DROP TABLE bug51920;

mysql-test/t/myisam-metadata.test

@@ -3,6 +3,7 @@
 #
 
 --source include/big_test.inc
+--source include/have_debug_sync.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
@@ -29,15 +30,18 @@ while ($1)
 --enable_query_log
 
 --connect(con1,localhost,root,,)
---send
+SET debug_sync= 'myisam_after_repair_by_sort SIGNAL waiting WAIT_FOR go';
+send
   ALTER TABLE t1 ENABLE KEYS;
 
 --connection default
---let $wait_timeout=10
+--let $wait_timeout=60
 --let $show_statement= SHOW PROCESSLIST
 --let $field= State
 --let $condition= = 'Repair by sorting'
 --source include/wait_show_condition.inc
+SET debug_sync= 'now WAIT_FOR waiting';
+SET debug_sync= 'now SIGNAL go';
 
 --replace_column 7 # 8 # 9 # 12 # 13 # 14 #
 SHOW TABLE STATUS LIKE 't1';

mysql-test/t/mysqld--help.test

@@ -10,6 +10,7 @@
 # force symbolic-links=0 (valgrind build has a different default)
 #
 
+--echo $MYSQLD_BOOTSTRAP_CMD
 exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help --verbose > $MYSQL_TMP_DIR/mysqld--help.txt 2>&1;
 
 # The inline perl code below will copy $MYSQL_TMP_DIR/mysqld--help.txt