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

MDEV-6314 - Compile/run MariaDB with ASan

Browse source 
Fixed some compilation errors/warnings with ASan.
This commit is contained in:
Sergey Vojtovich 2014-06-10 22:20:33 +04:00
parent 55b010233a
commit 7832f1bb62
6 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmysql/CMakeLists.txt
View file

@ -447,6 +447,10 @@ IF(NOT DISABLE_SHARED)
SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
IF(LINK_FLAG_NO_UNDEFINED OR VERSION_SCRIPT_LINK_FLAGS)
GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS)
IF(NOT libmysql_link_flags)
# Avoid libmysql_link_flags-NOTFOUND
SET(libmysql_link_flags)
ENDIF()
SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS
"${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED} ${VERSION_SCRIPT_LINK_FLAGS}")
ENDIF()

2
mysys/ma_dyncol.c
View file

@ -1610,7 +1610,7 @@ dynamic_new_column_store(DYNAMIC_COLUMN *str,
my_bool new_str)
{
struct st_service_funcs *fmt= fmt_data + hdr->format;
void **columns_order;
void **UNINIT_VAR(columns_order);
uchar *element;
uint i;
enum enum_dyncol_func_result rc= ER_DYNCOL_RESOURCE;

49
sql/item_strfunc.cc
View file

@ -514,39 +514,42 @@ void Item_func_from_base64::fix_length_and_dec()
String *Item_func_from_base64::val_str(String *str)
{
String *res= args[0]->val_str_ascii(str);
bool too_long= false;
int length;
const char *end_ptr;
if (!res ||
res->length() > (uint) base64_decode_max_arg_length() ||
(too_long=
((uint) (length= base64_needed_decoded_length((int) res->length())) >
current_thd->variables.max_allowed_packet)) ||
tmp_value.alloc((uint) length) ||
(length= base64_decode(res->ptr(), (int) res->length(),
if (!res)
goto err;
if (res->length() > (uint) base64_decode_max_arg_length() ||
((uint) (length= base64_needed_decoded_length((int) res->length())) >
current_thd->variables.max_allowed_packet))
{
push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN,
ER_WARN_ALLOWED_PACKET_OVERFLOWED,
ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name(),
current_thd->variables.max_allowed_packet);
goto err;
}
if (tmp_value.alloc((uint) length))
goto err;
if ((length= base64_decode(res->ptr(), (int) res->length(),
(char *) tmp_value.ptr(), &end_ptr, 0)) < 0 ||
end_ptr < res->ptr() + res->length())
{
null_value= 1; // NULL input, too long input, OOM, or badly formed input
if (too_long)
{
push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN,
ER_WARN_ALLOWED_PACKET_OVERFLOWED,
ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name(),
current_thd->variables.max_allowed_packet);
}
else if (res && length < 0)
{
push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN,
ER_BAD_BASE64_DATA, ER(ER_BAD_BASE64_DATA),
end_ptr - res->ptr());
}
return 0;
push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN,
ER_BAD_BASE64_DATA, ER(ER_BAD_BASE64_DATA),
end_ptr - res->ptr());
goto err;
}
tmp_value.length((uint) length);
null_value= 0;
return &tmp_value;
err:
null_value= 1; // NULL input, too long input, OOM, or badly formed input
return 0;
}
///////////////////////////////////////////////////////////////////////////////

3
sql/rpl_gtid.cc
View file

@ -120,7 +120,7 @@ rpl_slave_state::check_duplicate_gtid(rpl_gtid *gtid, rpl_group_info *rgi)
uint32 seq_no= gtid->seq_no;
rpl_slave_state::element *elem;
int res;
bool did_enter_cond;
bool did_enter_cond= false;
PSI_stage_info old_stage;
THD *thd;
Relay_log_info *rli= rgi->rli;
@ -138,7 +138,6 @@ rpl_slave_state::check_duplicate_gtid(rpl_gtid *gtid, rpl_group_info *rgi)
each lock release and re-take.
*/
did_enter_cond= false;
for (;;)
{
if (elem->highest_seq_no >= seq_no)

1
sql/sql_statistics.cc
View file

@ -1550,6 +1550,7 @@ public:
uint key_parts= table->actual_n_key_parts(key_info);
empty= TRUE;
prefixes= 0;
LINT_INIT(calc_state);
is_single_comp_pk= FALSE;
uint pk= table->s->primary_key;

2
sql/table_cache.cc
View file

@ -267,7 +267,7 @@ void tc_add_table(THD *thd, TABLE *table)
TABLE_SHARE *purge_share= 0;
TABLE_SHARE *share;
TABLE *entry;
ulonglong purge_time;
ulonglong UNINIT_VAR(purge_time);
TDC_iterator tdc_it;
tdc_it.init();