#At file:///home2/mydev/bzrroot/mysql-5.6-backup-backport-ms09-2/ based on revid:ingo.struewing@stripped
3034 Ingo Struewing 2010-01-06
WL#5101 - MySQL Backup back port
Merged revid:staale.smedseng@stripped
Bug #43414 Parenthesis (and other) warnings compiling MySQL
with gcc 4.3.2.
original changeset: 3590.5.3
@ cmd-line-utils/readline/rlmbutil.h
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
@ mysys/lf_alloc-pin.c
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
@ mysys/my_handler.c
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
Wrong argument to my_error_register() after parameter
change. Used in extra/perror application.
@ sql/ha_partition.cc
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
@ sql/handler.cc
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
@ sql/item_sum.cc
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
@ sql/sql_base.cc
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
@ sql/sql_plugin.cc
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
@ sql/sql_plugin_services.h
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
@ sql/sql_repl.cc
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
@ storage/myisam/mi_create.c
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
@ storage/myisam/mi_log.c
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
@ strings/my_vsnprintf.c
WL#5101 - MySQL Backup back port
Bug #43414 Parenthesis (and other) warnings compiling MySQL
modified:
cmd-line-utils/readline/rlmbutil.h
mysys/lf_alloc-pin.c
mysys/my_handler.c
sql/ha_partition.cc
sql/handler.cc
sql/item_sum.cc
sql/sql_base.cc
sql/sql_plugin.cc
sql/sql_plugin_services.h
sql/sql_repl.cc
storage/myisam/mi_create.c
storage/myisam/mi_log.c
strings/my_vsnprintf.c
=== modified file 'cmd-line-utils/readline/rlmbutil.h'
--- a/cmd-line-utils/readline/rlmbutil.h 2007-11-19 13:38:08 +0000
+++ b/cmd-line-utils/readline/rlmbutil.h 2010-01-06 15:11:13 +0000
@@ -109,8 +109,8 @@ extern int _rl_is_mbchar_matched PARAMS(
extern wchar_t _rl_char_value PARAMS((char *, int));
extern int _rl_walphabetic PARAMS((wchar_t));
-#define _rl_to_wupper(wc) (iswlower (wc) ? towupper (wc) : (wc))
-#define _rl_to_wlower(wc) (iswupper (wc) ? towlower (wc) : (wc))
+#define _rl_to_wupper(wc) (iswlower (wc) ? (wchar_t)towupper (wc) : (wc))
+#define _rl_to_wlower(wc) (iswupper (wc) ? (wchar_t)towlower (wc) : (wc))
#define MB_NEXTCHAR(b,s,c,f) \
((MB_CUR_MAX > 1 && rl_byte_oriented == 0) \
=== modified file 'mysys/lf_alloc-pin.c'
--- a/mysys/lf_alloc-pin.c 2009-11-18 02:31:40 +0000
+++ b/mysys/lf_alloc-pin.c 2010-01-06 15:11:13 +0000
@@ -329,10 +329,9 @@ static void _lf_pinbox_real_free(LF_PINS
{
int npins, alloca_size;
void *list, **addr;
- void *first, *last= NULL;
+ void *UNINIT_VAR(first), *last= NULL;
LF_PINBOX *pinbox= pins->pinbox;
- LINT_INIT(first);
npins= pinbox->pins_in_array+1;
#ifdef HAVE_ALLOCA
=== modified file 'mysys/my_handler.c'
--- a/mysys/my_handler.c 2008-03-28 16:45:03 +0000
+++ b/mysys/my_handler.c 2010-01-06 15:11:13 +0000
@@ -569,6 +569,16 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyse
/*
+ Return a pointer to the array of handler error messages. For use in
+ my_error(), by way of my_handler_error_register() below.
+ */
+static const char** get_handler_error_messages()
+{
+ return handler_error_messages;
+}
+
+
+/*
Register handler error messages for usage with my_error()
NOTES
@@ -587,7 +597,7 @@ void my_handler_error_register(void)
*/
compile_time_assert(HA_ERR_FIRST + array_elements(handler_error_messages) ==
HA_ERR_LAST + 1);
- my_error_register(handler_error_messages, HA_ERR_FIRST,
+ my_error_register(get_handler_error_messages, HA_ERR_FIRST,
HA_ERR_FIRST+ array_elements(handler_error_messages)-1);
}
=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc 2009-12-02 23:09:22 +0000
+++ b/sql/ha_partition.cc 2010-01-06 15:11:13 +0000
@@ -1145,7 +1145,7 @@ int ha_partition::handle_opt_partitions(
{
if (part_elem->part_state == PART_ADMIN)
part_elem->part_state= PART_NORMAL;
- } while (part_elem= part_it++);
+ } while ((part_elem= part_it++));
DBUG_RETURN(error);
}
} while (++j < num_subparts);
@@ -1177,7 +1177,7 @@ int ha_partition::handle_opt_partitions(
{
if (part_elem->part_state == PART_ADMIN)
part_elem->part_state= PART_NORMAL;
- } while (part_elem= part_it++);
+ } while ((part_elem= part_it++));
DBUG_RETURN(error);
}
}
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc 2009-12-31 16:09:59 +0000
+++ b/sql/handler.cc 2010-01-06 15:11:13 +0000
@@ -4116,7 +4116,7 @@ int handler::read_multi_range_first(KEY_
*/
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. */
=== modified file 'sql/item_sum.cc'
--- a/sql/item_sum.cc 2009-11-17 11:24:23 +0000
+++ b/sql/item_sum.cc 2010-01-06 15:11:13 +0000
@@ -804,7 +804,7 @@ bool Aggregator_distinct::setup(THD *thd
tree_key_length+= f->pack_length();
if ((type == MYSQL_TYPE_VARCHAR) ||
(!f->binary() && (type == MYSQL_TYPE_STRING ||
- type == MYSQL_TYPE_VAR_STRING)))
+ type == MYSQL_TYPE_VAR_STRING)))
{
all_binary= FALSE;
break;
=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc 2009-12-22 16:09:15 +0000
+++ b/sql/sql_base.cc 2010-01-06 15:11:13 +0000
@@ -728,6 +728,7 @@ TABLE_SHARE *get_cached_table_share(cons
}
+#ifdef DISABLED_UNTIL_GRL_IS_MADE_PART_OF_MDL
/**
@brief Mark table share as having one more user (increase its reference
count).
@@ -746,6 +747,8 @@ static void reference_table_share(TABLE_
DBUG_VOID_RETURN;
}
+#endif /* DISABLED_UNTIL_GRL_IS_MADE_PART_OF_MDL */
+
/*
Create a list for all open tables matching SQL expression
=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc 2009-12-16 08:33:54 +0000
+++ b/sql/sql_plugin.cc 2010-01-06 15:11:13 +0000
@@ -101,7 +101,9 @@ static int cur_plugin_info_interface_ver
/* support for Services */
+#ifdef HAVE_DLOPEN
#include "sql_plugin_services.h"
+#endif /* HAVE_DLOPEN */
/*
A mutex LOCK_plugin must be acquired before accessing the
=== modified file 'sql/sql_plugin_services.h'
--- a/sql/sql_plugin_services.h 2009-11-02 20:05:42 +0000
+++ b/sql/sql_plugin_services.h 2010-01-06 15:11:13 +0000
@@ -22,6 +22,7 @@ struct st_service_ref {
void *service;
};
+#ifdef HAVE_DLOPEN
static struct my_snprintf_service_st my_snprintf_handler = {
my_snprintf,
my_vsnprintf
@@ -41,4 +42,5 @@ static struct st_service_ref list_of_ser
{ "my_snprintf_service", VERSION_my_snprintf, &my_snprintf_handler },
{ "thd_alloc_service", VERSION_thd_alloc, &thd_alloc_handler }
};
+#endif /* HAVE_DLOPEN */
=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc 2009-12-30 17:12:16 +0000
+++ b/sql/sql_repl.cc 2010-01-06 15:11:13 +0000
@@ -835,7 +835,7 @@ impossible position";
set_timespec_nsec(*heartbeat_ts, heartbeat_period);
}
ret= mysql_bin_log.wait_for_update_bin_log(thd, heartbeat_ts);
- DBUG_ASSERT(ret == 0 || heartbeat_period != LL(0) && coord != NULL);
+ DBUG_ASSERT(ret == 0 || (heartbeat_period != 0LL && coord != NULL));
if (ret == ETIMEDOUT || ret == ETIME)
{
#ifndef DBUG_OFF
=== modified file 'storage/myisam/mi_create.c'
--- a/storage/myisam/mi_create.c 2010-01-04 21:13:14 +0000
+++ b/storage/myisam/mi_create.c 2010-01-06 15:11:13 +0000
@@ -38,7 +38,7 @@ int mi_create(const char *name,uint keys
MI_CREATE_INFO *ci,uint flags)
{
register uint i,j;
- File UNINIT_VAR(dfile),file;
+ File UNINIT_VAR(dfile),UNINIT_VAR(file);
int errpos,save_errno, create_mode= O_RDWR | O_TRUNC;
myf create_flag;
uint fields,length,max_key_length,packed,pointer,real_length_diff,
@@ -73,8 +73,6 @@ int mi_create(const char *name,uint keys
{
DBUG_RETURN(my_errno=HA_WRONG_CREATE_OPTION);
}
- LINT_INIT(dfile);
- LINT_INIT(file);
errpos=0;
options=0;
bzero((uchar*) &share,sizeof(share));
=== modified file 'storage/myisam/mi_log.c'
--- a/storage/myisam/mi_log.c 2009-12-31 16:09:59 +0000
+++ b/storage/myisam/mi_log.c 2010-01-06 15:11:13 +0000
@@ -295,7 +295,7 @@ void _myisam_log_command(IO_CACHE *log,
const uchar *buffert, uint length, int result)
{
uchar header[14];
- int error, old_errno, headerlen;
+ int UNINIT_VAR(error), old_errno, headerlen;
ulong pid=(ulong) GETPID();
my_bool logical= (log == &myisam_logical_log);
MYISAM_SHARE *share;
@@ -317,7 +317,6 @@ void _myisam_log_command(IO_CACHE *log,
else
{
file= (share= (MYISAM_SHARE *)info_or_share)->kfile;
- LINT_INIT(error);
}
DBUG_ASSERT(command == MI_LOG_OPEN || command == MI_LOG_DELETE ||
=== modified file 'strings/my_vsnprintf.c'
--- a/strings/my_vsnprintf.c 2009-11-03 23:15:16 +0000
+++ b/strings/my_vsnprintf.c 2010-01-06 15:11:13 +0000
@@ -401,7 +401,7 @@ start:
{
char *par= args_arr[print_arr[i].arg_idx].str_arg;
width= (print_arr[i].flags & WIDTH_ARG) ?
- args_arr[print_arr[i].width].longlong_arg : print_arr[i].width;
+ (uint)args_arr[print_arr[i].width].longlong_arg : print_arr[i].width;
to= process_str_arg(cs, to, end, width, par, print_arr[i].flags);
break;
}
@@ -409,7 +409,7 @@ start:
{
char *par = args_arr[print_arr[i].arg_idx].str_arg;
width= (print_arr[i].flags & WIDTH_ARG) ?
- args_arr[print_arr[i].width].longlong_arg : print_arr[i].width;
+ (uint)args_arr[print_arr[i].width].longlong_arg : print_arr[i].width;
to= process_bin_arg(to, end, width, par);
break;
}
@@ -429,7 +429,7 @@ start:
/* Integer parameter */
longlong larg;
length= (print_arr[i].flags & LENGTH_ARG) ?
- args_arr[print_arr[i].length].longlong_arg : print_arr[i].length;
+ (uint)args_arr[print_arr[i].length].longlong_arg : print_arr[i].length;
if (args_arr[print_arr[i].arg_idx].have_longlong)
larg = args_arr[print_arr[i].arg_idx].longlong_arg;
Attachment: [text/bzr-bundle] bzr/ingo.struewing@sun.com-20100106151113-q3rv9ot01j31myvw.bundle
| Thread |
|---|
| • bzr commit into mysql-backup-backport branch (ingo.struewing:3034)Bug#43414 WL#5101 | Ingo Struewing | 6 Jan |
