Merge 5.5->10.0-base

debian/autobake-deb.sh

@@ -21,8 +21,8 @@ source ./VERSION
 UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}"
 RELEASE_EXTRA=""
 
-RELEASE_NAME=mariadb
+RELEASE_NAME=""
-PATCHLEVEL=""
+PATCHLEVEL="+maria"
 LOGSTRING="MariaDB build"
 
 # Look up distro-version specific stuff.

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

storage/innobase/os/os0file.c

@@ -1369,7 +1369,6 @@ os_file_set_nocache(
 #endif
 static int os_file_set_atomic_writes(os_file_t file, const char *name) 
 {
-	static int first_time = 1;
 	int atomic_option = 1;
 
 	int ret = ioctl (file, DFS_IOCTL_ATOMIC_WRITE_SET, &atomic_option);
@@ -2027,7 +2026,7 @@ os_file_set_size(
 		 	"InnoDB: Error: preallocating data for"
 			" file %s failed at\n"
 			"InnoDB: offset 0 size %lld %lld. Operating system"
-			" error number %llu.\n"
+			" error number %d.\n"
 			"InnoDB: Check that the disk is not full"
 			" or a disk quota exceeded.\n"
 			"InnoDB: Some operating system error numbers"

storage/maria/ma_check.c

@@ -1246,17 +1246,13 @@ static int check_dynamic_record(HA_CHECK *param, MARIA_HA *info, int extend,
 {
   MARIA_BLOCK_INFO block_info;
   MARIA_SHARE *share= info->s;
-  my_off_t start_recpos, start_block, pos;
+  my_off_t UNINIT_VAR(start_recpos), start_block, pos;
-  uchar *to;
+  uchar *UNINIT_VAR(to);
-  ulong left_length;
+  ulong UNINIT_VAR(left_length);
   uint	b_type;
   char llbuff[22],llbuff2[22],llbuff3[22];
   DBUG_ENTER("check_dynamic_record");
 
-  LINT_INIT(left_length);
-  LINT_INIT(start_recpos);
-  LINT_INIT(to);
-
   pos= 0;
   while (pos < share->state.state.data_file_length)
   {
@@ -1847,10 +1843,8 @@ static int check_block_record(HA_CHECK *param, MARIA_HA *info, int extend,
        pos < share->state.state.data_file_length;
        pos+= block_size, page++)
   {
-    uint row_count, real_row_count, empty_space, page_type, bitmap_pattern;
+    uint UNINIT_VAR(row_count), real_row_count, empty_space, page_type, bitmap_pattern;
     uint bitmap_for_page;
-    LINT_INIT(row_count);
-    LINT_INIT(empty_space);
 
     if (_ma_killed_ptr(param))
     {

storage/maria/ma_checkpoint.c

@@ -758,13 +758,11 @@ static int collect_tables(LEX_STRING *str, LSN checkpoint_start_log_horizon)
   struct st_state_copy *state_copies= NULL, /**< fixed-size cache of states */
     *state_copies_end, /**< cache ends here */
     *state_copy; /**< iterator in cache */
-  TRANSLOG_ADDRESS state_copies_horizon; /**< horizon of states' _copies_ */
+  TRANSLOG_ADDRESS UNINIT_VAR(state_copies_horizon); /**< horizon of states' _copies_ */
   struct st_filter_param filter_param;
   PAGECACHE_FLUSH_FILTER filter;
   DBUG_ENTER("collect_tables");
 
-  LINT_INIT(state_copies_horizon);
-
   /* let's make a list of distinct shares */
   mysql_mutex_lock(&THR_LOCK_maria);
   for (nb= 0, pos= maria_open_list; pos; pos= pos->next)

storage/maria/ma_rt_split.c

@@ -185,18 +185,14 @@ static int split_maria_rtree_node(SplitStruct *node, int n_entries,
                                   double **d_buffer, int n_dim)
 {
   SplitStruct *cur;
-  SplitStruct *a;
+  SplitStruct *UNINIT_VAR(a);
-  SplitStruct *b;
+  SplitStruct *UNINIT_VAR(b);
   double *g1= reserve_coords(d_buffer, n_dim);
   double *g2= reserve_coords(d_buffer, n_dim);
-  SplitStruct *next;
+  SplitStruct *UNINIT_VAR(next);
-  int next_node;
+  int UNINIT_VAR(next_node);
   int i;
   SplitStruct *end= node + n_entries;
-  LINT_INIT(a);
-  LINT_INIT(b);
-  LINT_INIT(next);
-  LINT_INIT(next_node);
 
   if (all_size < min_size * 2)
   {

storage/myisam/ha_myisam.cc

@@ -30,6 +30,7 @@
 #include "rt_index.h"
 #include "sql_table.h"                          // tablename_to_filename
 #include "sql_class.h"                          // THD
+#include "debug_sync.h"
 
 ulonglong myisam_recover_options;
 static ulong opt_myisam_block_size;
@@ -1127,6 +1128,7 @@ int ha_myisam::repair(THD *thd, HA_CHECK &param, bool do_optimize)
         thd_proc_info(thd, "Repair by sorting");
         error = mi_repair_by_sort(&param, file, fixed_name,
                                   test(param.testflag & T_QUICK));
+        DEBUG_SYNC(thd, "myisam_after_repair_by_sort");
       }
       if (error && file->create_unique_index_by_sort && 
           share->state.dupp_key != MAX_KEY)