Merge 10.0-base -> 10.0

6 files changed, 13 insertions, 24 deletions

diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index 57ff14b9f95..6d1b3aacf41 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -1410,7 +1410,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);
@@ -3092,7 +3091,7 @@ os_file_get_status(
 The function os_file_dirname returns a directory component of a
 null-terminated pathname string. In the usual case, dirname returns
 the string up to, but not including, the final '/', and basename
-is the component following the final '/'. Trailing '/' charac­
+is the component following the final '/'. Trailing '/' charac­
 ters are not counted as part of the pathname.
 
 If path does not contain a slash, dirname returns the string ".".
diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c
index 192e2ed32a1..8d2a2d3aec3 100644
--- a/storage/maria/ma_check.c
+++ b/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;
-  uchar *to;
-  ulong left_length;
+  my_off_t UNINIT_VAR(start_recpos), start_block, pos;
+  uchar *UNINIT_VAR(to);
+  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))
     {
diff --git a/storage/maria/ma_checkpoint.c b/storage/maria/ma_checkpoint.c
index 304216a76d9..c4fa39a91d7 100644
--- a/storage/maria/ma_checkpoint.c
+++ b/storage/maria/ma_checkpoint.c
@@ -762,13 +762,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)
diff --git a/storage/maria/ma_rt_split.c b/storage/maria/ma_rt_split.c
index ea90b60ce12..d14422a21d2 100644
--- a/storage/maria/ma_rt_split.c
+++ b/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 *b;
+  SplitStruct *UNINIT_VAR(a);
+  SplitStruct *UNINIT_VAR(b);
   double *g1= reserve_coords(d_buffer, n_dim);
   double *g2= reserve_coords(d_buffer, n_dim);
-  SplitStruct *next;
-  int next_node;
+  SplitStruct *UNINIT_VAR(next);
+  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)
   {
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index 4caffdd5fe3..17dbcba8db9 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/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)
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index 8b824bc994d..8e3beebe02d 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -3082,7 +3082,7 @@ innobase_change_buffering_inited_ok:
 #endif
 
 #ifdef HAVE_POSIX_FALLOCATE
-	srv_use_posix_fallocate = (ibool) innobase_use_fallocate;
+	srv_use_posix_fallocate = 0 && (ibool) innobase_use_fallocate;
 #endif
 	srv_use_atomic_writes = (ibool) innobase_use_atomic_writes;
 	if (innobase_use_atomic_writes) {