mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

compiler warnings/errors

Browse source
This commit is contained in:
Sergei Golubchik 2011-11-23 18:25:07 +01:00
parent feba65a554
commit 7189f09aa6
7 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/mysqldump.c
View file

@ -4427,7 +4427,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
static int do_show_master_status(MYSQL *mysql_con, int consistent_binlog_pos) static int do_show_master_status(MYSQL *mysql_con, int consistent_binlog_pos)
{ {
MYSQL_ROW row; MYSQL_ROW row;
MYSQL_RES *master; MYSQL_RES *UNINIT_VAR(master);
char binlog_pos_file[FN_REFLEN]; char binlog_pos_file[FN_REFLEN];
char binlog_pos_offset[LONGLONG_LEN+1]; char binlog_pos_offset[LONGLONG_LEN+1];
char *file, *offset; char *file, *offset;

4
client/mysqltest.cc
View file

@ -8137,8 +8137,8 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
char *re_eprint(int err) char *re_eprint(int err)
{ {
static char epbuf[100]; static char epbuf[100];
size_t len= my_regerror(REG_ITOA|err, (my_regex_t *)NULL, size_t len __attribute__((unused))=
epbuf, sizeof(epbuf)); my_regerror(REG_ITOA|err, (my_regex_t *)NULL, epbuf, sizeof(epbuf));
assert(len <= sizeof(epbuf)); assert(len <= sizeof(epbuf));
return(epbuf); return(epbuf);
} }

2
mysql-test/suite/sys_vars/t/debug_binlog_fsync_sleep_basic.test
View file

@ -1,5 +1,7 @@
# ulong global # ulong global
--source include/have_debug.inc
SET @start_global_value = @@global.debug_binlog_fsync_sleep; SET @start_global_value = @@global.debug_binlog_fsync_sleep;
# #

4
mysys/CMakeLists.txt
View file

@ -70,6 +70,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY}
${LIBNSL} ${LIBM} ${LIBRT}) ${LIBNSL} ${LIBM} ${LIBRT})
DTRACE_INSTRUMENT(mysys) DTRACE_INSTRUMENT(mysys)
IF (WIN32)
TARGET_LINK_LIBRARIES(mysys IPHLPAPI)
ENDIF(WIN32)
ADD_EXECUTABLE(thr_lock thr_lock.c) ADD_EXECUTABLE(thr_lock thr_lock.c)
TARGET_LINK_LIBRARIES(thr_lock mysys) TARGET_LINK_LIBRARIES(thr_lock mysys)
SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN") SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN")

6
storage/maria/ma_bitmap.c
View file

@ -1239,10 +1239,9 @@ static my_bool allocate_head(MARIA_FILE_BITMAP *bitmap, uint size,
uint min_bits= size_to_head_pattern(bitmap, size); uint min_bits= size_to_head_pattern(bitmap, size);
uchar *data= bitmap->map, *end= data + bitmap->used_size; uchar *data= bitmap->map, *end= data + bitmap->used_size;
uchar *best_data= 0; uchar *best_data= 0;
uint best_bits= (uint) -1, best_pos; uint best_bits= (uint) -1, UNINIT_VAR(best_pos);
DBUG_ENTER("allocate_head"); DBUG_ENTER("allocate_head");
LINT_INIT(best_pos);
DBUG_ASSERT(size <= FULL_PAGE_SIZE(bitmap->block_size)); DBUG_ASSERT(size <= FULL_PAGE_SIZE(bitmap->block_size));
for (; data < end; data+= 6) for (; data < end; data+= 6)
@ -1319,11 +1318,10 @@ static my_bool allocate_tail(MARIA_FILE_BITMAP *bitmap, uint size,
uint min_bits= size_to_tail_pattern(bitmap, size); uint min_bits= size_to_tail_pattern(bitmap, size);
uchar *data= bitmap->map, *end= data + bitmap->used_size; uchar *data= bitmap->map, *end= data + bitmap->used_size;
uchar *best_data= 0; uchar *best_data= 0;
uint best_bits= (uint) -1, best_pos; uint best_bits= (uint) -1, UNINIT_VAR(best_pos);
DBUG_ENTER("allocate_tail"); DBUG_ENTER("allocate_tail");
DBUG_PRINT("enter", ("size: %u", size)); DBUG_PRINT("enter", ("size: %u", size));
LINT_INIT(best_pos);
/* /*
We have to add DIR_ENTRY_SIZE here as this is not part of the data size We have to add DIR_ENTRY_SIZE here as this is not part of the data size
See call to allocate_tail() in find_tail(). See call to allocate_tail() in find_tail().

3
storage/maria/maria_chk.c
View file

@ -798,8 +798,7 @@ get_one_option(int optid,
case OPT_STATS_METHOD: case OPT_STATS_METHOD:
{ {
int method; int method;
enum_handler_stats_method method_conv; enum_handler_stats_method UNINIT_VAR(method_conv);
LINT_INIT(method_conv);
maria_stats_method_str= argument; maria_stats_method_str= argument;
if ((method=find_type(argument, &maria_stats_method_typelib, 2)) <= 0) if ((method=find_type(argument, &maria_stats_method_typelib, 2)) <= 0)
{ {

4
storage/myisam/myisamchk.c
View file

@ -670,8 +670,8 @@ get_one_option(int optid,
case OPT_STATS_METHOD: case OPT_STATS_METHOD:
{ {
int method; int method;
enum_handler_stats_method method_conv; enum_handler_stats_method UNINIT_VAR(method_conv);
LINT_INIT(method_conv);
myisam_stats_method_str= argument; myisam_stats_method_str= argument;
if ((method= find_type(argument, &myisam_stats_method_typelib, if ((method= find_type(argument, &myisam_stats_method_typelib,
FIND_TYPE_BASIC)) <= 0) FIND_TYPE_BASIC)) <= 0)