Commit b0185d2a authored by Mats Kindahl's avatar Mats Kindahl

Merging with mysql-5.5-bugteam

parents 55c752fc 2495e10c
...@@ -855,7 +855,7 @@ _rl_read_init_file (filename, include_level) ...@@ -855,7 +855,7 @@ _rl_read_init_file (filename, include_level)
{ {
register int i; register int i;
char *buffer, *openname, *line, *end; char *buffer, *openname, *line, *end;
size_t file_size; size_t file_size = 0;
current_readline_init_file = filename; current_readline_init_file = filename;
current_readline_init_include_level = include_level; current_readline_init_include_level = include_level;
......
...@@ -76,7 +76,9 @@ extern "C" { ...@@ -76,7 +76,9 @@ extern "C" {
extern void *(*my_str_malloc)(size_t); extern void *(*my_str_malloc)(size_t);
extern void (*my_str_free)(void *); 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)) #define strmov(A,B) stpcpy((A),(B))
#ifndef stpcpy #ifndef stpcpy
extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */ extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */
......
...@@ -76,6 +76,11 @@ ...@@ -76,6 +76,11 @@
/** /**
Generic (compiler-independent) features. Generic (compiler-independent) features.
*/ */
#ifndef MY_GNUC_PREREQ
# define MY_GNUC_PREREQ(maj, min) (0)
#endif
#ifndef MY_ALIGNOF #ifndef MY_ALIGNOF
# ifdef __cplusplus # ifdef __cplusplus
template<typename type> struct my_alignof_helper { char m1; type m2; }; template<typename type> struct my_alignof_helper { char m1; type m2; };
......
...@@ -3963,11 +3963,11 @@ static int flush_key_blocks_int(KEY_CACHE *keycache, ...@@ -3963,11 +3963,11 @@ static int flush_key_blocks_int(KEY_CACHE *keycache,
if (!(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH | if (!(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH |
BLOCK_REASSIGNED))) BLOCK_REASSIGNED)))
{ {
struct st_hash_link *next_hash_link; struct st_hash_link *UNINIT_VAR(next_hash_link);
my_off_t next_diskpos; my_off_t UNINIT_VAR(next_diskpos);
File next_file; File UNINIT_VAR(next_file);
uint next_status; uint UNINIT_VAR(next_status);
uint hash_requests; uint UNINIT_VAR(hash_requests);
total_found++; total_found++;
found++; found++;
......
...@@ -117,6 +117,7 @@ size_t nmatch; ...@@ -117,6 +117,7 @@ size_t nmatch;
my_regmatch_t pmatch[]; my_regmatch_t pmatch[];
int eflags; int eflags;
{ {
char *pstr = (char *) str;
register struct re_guts *g = preg->re_g; register struct re_guts *g = preg->re_g;
#ifdef REDEBUG #ifdef REDEBUG
# define GOODFLAGS(f) (f) # define GOODFLAGS(f) (f)
...@@ -133,7 +134,7 @@ int eflags; ...@@ -133,7 +134,7 @@ int eflags;
if ((size_t) g->nstates <= CHAR_BIT*sizeof(states1) && if ((size_t) g->nstates <= CHAR_BIT*sizeof(states1) &&
!(eflags&REG_LARGE)) !(eflags&REG_LARGE))
return(smatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags)); return(smatcher(preg->charset, g, pstr, nmatch, pmatch, eflags));
else else
return(lmatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags)); return(lmatcher(preg->charset, g, pstr, nmatch, pmatch, eflags));
} }
...@@ -1691,7 +1691,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action) ...@@ -1691,7 +1691,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
if (action->execute) if (action->execute)
{ {
const char *old_proc_info; const char *UNINIT_VAR(old_proc_info);
action->execute--; action->execute--;
......
...@@ -4160,7 +4160,7 @@ int handler::read_multi_range_first(KEY_MULTI_RANGE **found_range_p, ...@@ -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 handler::read_multi_range_next(KEY_MULTI_RANGE **found_range_p)
{ {
int result; int UNINIT_VAR(result);
DBUG_ENTER("handler::read_multi_range_next"); DBUG_ENTER("handler::read_multi_range_next");
/* We should not be called after the last call returned EOF. */ /* We should not be called after the last call returned EOF. */
......
...@@ -2513,7 +2513,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli) ...@@ -2513,7 +2513,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli)
if (slave_trans_retries) if (slave_trans_retries)
{ {
int temp_err; int UNINIT_VAR(temp_err);
if (exec_res && (temp_err= has_temporary_error(thd))) if (exec_res && (temp_err= has_temporary_error(thd)))
{ {
const char *errmsg; const char *errmsg;
......
...@@ -7484,8 +7484,8 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info, ...@@ -7484,8 +7484,8 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info,
PARTITION_ITERATOR *part_iter) PARTITION_ITERATOR *part_iter)
{ {
Field *field= part_info->part_field_array[0]; Field *field= part_info->part_field_array[0];
uint32 max_endpoint_val; uint32 UNINIT_VAR(max_endpoint_val);
get_endpoint_func get_endpoint; get_endpoint_func UNINIT_VAR(get_endpoint);
bool can_match_multiple_values; /* is not '=' */ bool can_match_multiple_values; /* is not '=' */
uint field_len= field->pack_length_in_rec(); uint field_len= field->pack_length_in_rec();
DBUG_ENTER("get_part_iter_for_interval_via_mapping"); DBUG_ENTER("get_part_iter_for_interval_via_mapping");
......
...@@ -63,7 +63,7 @@ static int FT_SUPERDOC_cmp(void* cmp_arg __attribute__((unused)), ...@@ -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) 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; uint keylen, doc_cnt;
FT_SUPERDOC sdoc, *sptr; FT_SUPERDOC sdoc, *sptr;
TREE_ELEMENT *selem; TREE_ELEMENT *selem;
......
...@@ -220,7 +220,7 @@ MYRG_INFO *myrg_parent_open(const char *parent_name, ...@@ -220,7 +220,7 @@ MYRG_INFO *myrg_parent_open(const char *parent_name,
int (*callback)(void*, const char*), int (*callback)(void*, const char*),
void *callback_param) void *callback_param)
{ {
MYRG_INFO *m_info; MYRG_INFO *UNINIT_VAR(m_info);
int rc; int rc;
int errpos; int errpos;
int save_errno; int save_errno;
......
...@@ -1199,7 +1199,7 @@ my_bool fetch_n(const char **query_list, unsigned query_count, ...@@ -1199,7 +1199,7 @@ my_bool fetch_n(const char **query_list, unsigned query_count,
/* Separate thread query to test some cases */ /* 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; MYSQL *l_mysql;
my_bool error; my_bool error;
...@@ -1221,7 +1221,7 @@ static my_bool thread_query(char *query) ...@@ -1221,7 +1221,7 @@ static my_bool thread_query(char *query)
goto end; goto end;
} }
l_mysql->reconnect= 1; 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)); fprintf(stderr, "Query failed (%s)\n", mysql_error(l_mysql));
error= 1; error= 1;
...@@ -6447,7 +6447,7 @@ static void test_prepare_alter() ...@@ -6447,7 +6447,7 @@ static void test_prepare_alter()
rc= mysql_stmt_execute(stmt); rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc); 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); exit(1);
is_null= 1; is_null= 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment