Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.

Davi Arnaut · Davi Arnaut · commit 2495e10c110c · 2010-11-16T07:45:07.000-02:00
diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c
@@ -855,7 +855,7 @@ _rl_read_init_file (filename, include_level)
 {
   register int i;
   char *buffer, *openname, *line, *end;
-  size_t file_size;
+  size_t file_size = 0;
 
   current_readline_init_file = filename;
   current_readline_init_include_level = include_level;
diff --git a/include/m_string.h b/include/m_string.h
@@ -76,7 +76,9 @@ extern "C" {
 extern void *(*my_str_malloc)(size_t);
 extern void (*my_str_free)(void *);
 
-#if defined(HAVE_STPCPY)
+#if MY_GNUC_PREREQ(3, 4)
+#define strmov(dest, src) __builtin_stpcpy(dest, src)
+#elif defined(HAVE_STPCPY)
 #define strmov(A,B) stpcpy((A),(B))
 #ifndef stpcpy
 extern char *stpcpy(char *, const char *);	/* For AIX with gcc 2.95.3 */
diff --git a/include/my_compiler.h b/include/my_compiler.h
@@ -76,6 +76,11 @@
 /**
   Generic (compiler-independent) features.
 */
+
+#ifndef MY_GNUC_PREREQ
+# define MY_GNUC_PREREQ(maj, min) (0)
+#endif
+
 #ifndef MY_ALIGNOF
 # ifdef __cplusplus
     template<typename type> struct my_alignof_helper { char m1; type m2; };
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
@@ -3963,11 +3963,11 @@ static int flush_key_blocks_int(KEY_CACHE *keycache,
             if (!(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH |
                                    BLOCK_REASSIGNED)))
             {
-              struct st_hash_link *next_hash_link;
-              my_off_t            next_diskpos;
-              File                next_file;
-              uint                next_status;
-              uint                hash_requests;
+              struct st_hash_link *UNINIT_VAR(next_hash_link);
+              my_off_t UNINIT_VAR(next_diskpos);
+              File UNINIT_VAR(next_file);
+              uint UNINIT_VAR(next_status);
+              uint UNINIT_VAR(hash_requests);
 
               total_found++;
               found++;
diff --git a/regex/regexec.c b/regex/regexec.c
@@ -117,6 +117,7 @@ size_t nmatch;
 my_regmatch_t pmatch[];
 int eflags;
 {
+	char *pstr = (char *) str;
 	register struct re_guts *g = preg->re_g;
 #ifdef REDEBUG
 #	define	GOODFLAGS(f)	(f)
@@ -133,7 +134,7 @@ int eflags;
 
 	if ((size_t) g->nstates <= CHAR_BIT*sizeof(states1) &&
 	    !(eflags&REG_LARGE))
-		return(smatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags));
+		return(smatcher(preg->charset, g, pstr, nmatch, pmatch, eflags));
 	else
-		return(lmatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags));
+		return(lmatcher(preg->charset, g, pstr, nmatch, pmatch, eflags));
 }
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
@@ -1691,7 +1691,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
 
   if (action->execute)
   {
-    const char  *old_proc_info;
+    const char *UNINIT_VAR(old_proc_info);
 
     action->execute--;
 
diff --git a/sql/handler.cc b/sql/handler.cc
@@ -4160,7 +4160,7 @@ int handler::read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
 */
 int handler::read_multi_range_next(KEY_MULTI_RANGE **found_range_p)
 {
-  int result;
+  int UNINIT_VAR(result);
   DBUG_ENTER("handler::read_multi_range_next");
 
   /* We should not be called after the last call returned EOF. */
diff --git a/sql/slave.cc b/sql/slave.cc
@@ -2513,7 +2513,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli)
 
     if (slave_trans_retries)
     {
-      int temp_err;
+      int UNINIT_VAR(temp_err);
       if (exec_res && (temp_err= has_temporary_error(thd)))
       {
         const char *errmsg;
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
@@ -7484,8 +7484,8 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info,
                                            PARTITION_ITERATOR *part_iter)
 {
   Field *field= part_info->part_field_array[0];
-  uint32             max_endpoint_val;
-  get_endpoint_func  get_endpoint;
+  uint32             UNINIT_VAR(max_endpoint_val);
+  get_endpoint_func  UNINIT_VAR(get_endpoint);
   bool               can_match_multiple_values;  /* is not '=' */
   uint field_len= field->pack_length_in_rec();
   DBUG_ENTER("get_part_iter_for_interval_via_mapping");
diff --git a/storage/myisam/ft_nlq_search.c b/storage/myisam/ft_nlq_search.c
@@ -63,7 +63,7 @@ static int FT_SUPERDOC_cmp(void* cmp_arg __attribute__((unused)),
 
 static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
 {
-  int	       subkeys, r;
+  int	       UNINIT_VAR(subkeys), r;
   uint	       keylen, doc_cnt;
   FT_SUPERDOC  sdoc, *sptr;
   TREE_ELEMENT *selem;
diff --git a/storage/myisammrg/myrg_open.c b/storage/myisammrg/myrg_open.c
@@ -220,7 +220,7 @@ MYRG_INFO *myrg_parent_open(const char *parent_name,
                             int (*callback)(void*, const char*),
                             void *callback_param)
 {
-  MYRG_INFO *m_info;
+  MYRG_INFO *UNINIT_VAR(m_info);
   int       rc;
   int       errpos;
   int       save_errno;
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
@@ -1199,7 +1199,7 @@ my_bool fetch_n(const char **query_list, unsigned query_count,
 
 /* Separate thread query to test some cases */
 
-static my_bool thread_query(char *query)
+static my_bool thread_query(const char *query)
 {
   MYSQL *l_mysql;
   my_bool error;
@@ -1221,7 +1221,7 @@ static my_bool thread_query(char *query)
     goto end;
   }
   l_mysql->reconnect= 1;
-  if (mysql_query(l_mysql, (char *)query))
+  if (mysql_query(l_mysql, query))
   {
      fprintf(stderr, "Query failed (%s)\n", mysql_error(l_mysql));
      error= 1;
@@ -6447,7 +6447,7 @@ static void test_prepare_alter()
   rc= mysql_stmt_execute(stmt);
   check_execute(stmt, rc);
 
-  if (thread_query((char *)"ALTER TABLE test_prep_alter change id id_new varchar(20)"))
+  if (thread_query("ALTER TABLE test_prep_alter change id id_new varchar(20)"))
     exit(1);
 
   is_null= 1;

Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ _rl_read_init_file (filename, include_level)`
`855`	`855`	`{`
`856`	`856`	`register int i;`
`857`	`857`	`char buffer, openname, line, end;`
`858`		`- size_t file_size;`
	`858`	`+ size_t file_size = 0;`
`859`	`859`
`860`	`860`	`current_readline_init_file = filename;`
`861`	`861`	`current_readline_init_include_level = include_level;`
Original file line number	Diff line number	Diff line change
`@@ -1691,7 +1691,7 @@ static void debug_sync_execute(THD thd, st_debug_sync_action action)`
`1691`	`1691`
`1692`	`1692`	`if (action->execute)`
`1693`	`1693`	`{`
`1694`		`- const char *old_proc_info;`
	`1694`	`+ const char *UNINIT_VAR(old_proc_info);`
`1695`	`1695`
`1696`	`1696`	`action->execute--;`
`1697`	`1697`
Original file line number	Diff line number	Diff line change
`@@ -4160,7 +4160,7 @@ int handler::read_multi_range_first(KEY_MULTI_RANGE **found_range_p,`
`4160`	`4160`	`*/`
`4161`	`4161`	`int handler::read_multi_range_next(KEY_MULTI_RANGE **found_range_p)`
`4162`	`4162`	`{`
`4163`		`- int result;`
	`4163`	`+ int UNINIT_VAR(result);`
`4164`	`4164`	`DBUG_ENTER("handler::read_multi_range_next");`
`4165`	`4165`
`4166`	`4166`	`/* We should not be called after the last call returned EOF. */`
Original file line number	Diff line number	Diff line change
`@@ -2513,7 +2513,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli)`
`2513`	`2513`
`2514`	`2514`	`if (slave_trans_retries)`
`2515`	`2515`	`{`
`2516`		`- int temp_err;`
	`2516`	`+ int UNINIT_VAR(temp_err);`
`2517`	`2517`	`if (exec_res && (temp_err= has_temporary_error(thd)))`
`2518`	`2518`	`{`
`2519`	`2519`	`const char *errmsg;`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ static int FT_SUPERDOC_cmp(void* cmp_arg __attribute__((unused)),`
`63`	`63`
`64`	`64`	`static int walk_and_match(FT_WORD word, uint32 count, ALL_IN_ONE aio)`
`65`	`65`	`{`
`66`		`- int subkeys, r;`
	`66`	`+ int UNINIT_VAR(subkeys), r;`
`67`	`67`	`uint keylen, doc_cnt;`
`68`	`68`	`FT_SUPERDOC sdoc, *sptr;`
`69`	`69`	`TREE_ELEMENT *selem;`