Skip to content

M
MariaDB
Commit 22ebf3cb authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11" 

10.0 part of the fix
parent 98ea8062
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 50 deletions
storage/innobase/fts/fts0fts.cc
View file @ 22ebf3cb
......@@ -6274,7 +6274,7 @@ fts_fake_hex_to_dec(
#ifdef _WIN32
ret = sscanf(tmp_id, "%016llu", &dec_id);
#else
ret = sscanf(tmp_id, "%016"PRIu64, &dec_id);
ret = sscanf(tmp_id, "%016" PRIu64, &dec_id);
#endif /* _WIN32 */
ut_ad(ret == 1);
......
storage/innobase/include/fts0priv.ic
View file @ 22ebf3cb
......@@ -53,7 +53,7 @@ fts_write_object_id(
/* Use this to construct old(5.6.14 and 5.7.3) windows
ambiguous aux table names */
DBUG_EXECUTE_IF("innodb_test_wrong_windows_fts_aux_table_name",
return(sprintf(str, "%016"PRIu64, id)););
return(sprintf(str, "%016" PRIu64, id)););
DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
return(sprintf(str, UINT64PFx, id)););
......@@ -66,7 +66,7 @@ fts_write_object_id(
// FIXME: Use ut_snprintf(), so does following one.
return(sprintf(str, "%016llu", id));
#else /* _WIN32 */
return(sprintf(str, "%016"PRIu64, id));
return(sprintf(str, "%016" PRIu64, id));
#endif /* _WIN32 */
}
......
storage/mroonga/mrn_table.cpp
View file @ 22ebf3cb
......@@ -272,7 +272,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
#define MRN_PARAM_STR(title_name, param_name) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info", ("mroonga "title_name" start")); \
DBUG_PRINT("info", ("mroonga " title_name " start")); \
if (!share->param_name) \
{ \
if ((share->param_name = mrn_get_string_between_quote( \
......@@ -284,7 +284,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info", ("mroonga "title_name"=%s", share->param_name)); \
DBUG_PRINT("info", ("mroonga " title_name "=%s", share->param_name)); \
} \
break; \
}
......@@ -292,7 +292,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
#define MRN_PARAM_STR_LIST(title_name, param_name, param_pos) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info", ("mroonga "title_name" start")); \
DBUG_PRINT("info", ("mroonga " title_name " start")); \
if (share->param_name && !share->param_name[param_pos]) \
{ \
if ((share->param_name[param_pos] = mrn_get_string_between_quote( \
......@@ -305,7 +305,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info", ("mroonga "title_name"[%d]=%s", param_pos, \
DBUG_PRINT("info", ("mroonga " title_name "[%d]=%s", param_pos, \
share->param_name[param_pos])); \
} \
break; \
......
storage/oqgraph/graphcore.cc
View file @ 22ebf3cb
......@@ -1036,11 +1036,11 @@ int stack_cursor::fetch_row(const row &row_info, row &result,
optional<EdgeWeight> w;
optional<Vertex> v;
result= row_info;
if ((result.seq_indicator= seq= last.sequence()))
if ((result.seq_indicator= static_cast<bool>(seq= last.sequence())))
result.seq= *seq;
if ((result.link_indicator= v= last.vertex()))
if ((result.link_indicator= static_cast<bool>(v= last.vertex())))
result.link= get(boost::vertex_index, share->g, *v);
if ((result.weight_indicator= w= last.weight()))
if ((result.weight_indicator= static_cast<bool>(w= last.weight())))
result.weight= *w;
return oqgraph::OK;
}
......
storage/spider/spd_copy_tables.cc
View file @ 22ebf3cb
......@@ -81,7 +81,7 @@ int spider_udf_set_copy_tables_param_default(
#define SPIDER_PARAM_STR(title_name, param_name) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (!copy_tables->param_name) \
{ \
if ((copy_tables->param_name = spider_get_string_between_quote( \
......@@ -94,14 +94,14 @@ int spider_udf_set_copy_tables_param_default(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%s", copy_tables->param_name)); \
DBUG_PRINT("info",("spider " title_name "=%s", copy_tables->param_name)); \
} \
break; \
}
#define SPIDER_PARAM_HINT_WITH_MAX(title_name, param_name, check_length, max_size, min_val, max_val) \
if (!strncasecmp(tmp_ptr, title_name, check_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
DBUG_PRINT("info",("spider max_size=%d", max_size)); \
int hint_num = atoi(tmp_ptr + check_length) - 1; \
DBUG_PRINT("info",("spider hint_num=%d", hint_num)); \
......@@ -131,7 +131,7 @@ int spider_udf_set_copy_tables_param_default(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"[%d]=%d", hint_num, \
DBUG_PRINT("info",("spider " title_name "[%d]=%d", hint_num, \
copy_tables->param_name[hint_num])); \
} else { \
error_num = ER_SPIDER_INVALID_UDF_PARAM_NUM; \
......@@ -144,7 +144,7 @@ int spider_udf_set_copy_tables_param_default(
#define SPIDER_PARAM_INT_WITH_MAX(title_name, param_name, min_val, max_val) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (copy_tables->param_name == -1) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -161,14 +161,14 @@ int spider_udf_set_copy_tables_param_default(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%d", copy_tables->param_name)); \
DBUG_PRINT("info",("spider " title_name "=%d", copy_tables->param_name)); \
} \
break; \
}
#define SPIDER_PARAM_INT(title_name, param_name, min_val) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (copy_tables->param_name == -1) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -183,14 +183,14 @@ int spider_udf_set_copy_tables_param_default(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%d", copy_tables->param_name)); \
DBUG_PRINT("info",("spider " title_name "=%d", copy_tables->param_name)); \
} \
break; \
}
#define SPIDER_PARAM_LONGLONG(title_name, param_name, min_val) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (copy_tables->param_name == -1) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -206,7 +206,7 @@ int spider_udf_set_copy_tables_param_default(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%lld", \
DBUG_PRINT("info",("spider " title_name "=%lld", \
copy_tables->param_name)); \
} \
break; \
......
storage/spider/spd_direct_sql.cc
View file @ 22ebf3cb
......@@ -896,7 +896,7 @@ int spider_udf_direct_sql_get_server(
#define SPIDER_PARAM_STR(title_name, param_name) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (!direct_sql->param_name) \
{ \
if ((direct_sql->param_name = spider_get_string_between_quote( \
......@@ -909,14 +909,14 @@ int spider_udf_direct_sql_get_server(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%s", direct_sql->param_name)); \
DBUG_PRINT("info",("spider " title_name "=%s", direct_sql->param_name)); \
} \
break; \
}
#define SPIDER_PARAM_HINT_WITH_MAX(title_name, param_name, check_length, max_size, min_val, max_val) \
if (!strncasecmp(tmp_ptr, title_name, check_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
DBUG_PRINT("info",("spider max_size=%d", max_size)); \
int hint_num = atoi(tmp_ptr + check_length) - 1; \
DBUG_PRINT("info",("spider hint_num=%d", hint_num)); \
......@@ -946,7 +946,7 @@ int spider_udf_direct_sql_get_server(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"[%d]=%d", hint_num, \
DBUG_PRINT("info",("spider " title_name "[%d]=%d", hint_num, \
direct_sql->param_name[hint_num])); \
} else { \
error_num = ER_SPIDER_INVALID_CONNECT_INFO_NUM; \
......@@ -959,7 +959,7 @@ int spider_udf_direct_sql_get_server(
#define SPIDER_PARAM_INT_WITH_MAX(title_name, param_name, min_val, max_val) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (direct_sql->param_name == -1) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -976,7 +976,7 @@ int spider_udf_direct_sql_get_server(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%d", \
DBUG_PRINT("info",("spider " title_name "=%d", \
(int) direct_sql->param_name)); \
} \
break; \
......@@ -984,7 +984,7 @@ int spider_udf_direct_sql_get_server(
#define SPIDER_PARAM_INT(title_name, param_name, min_val) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (direct_sql->param_name == -1) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -999,14 +999,14 @@ int spider_udf_direct_sql_get_server(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%d", direct_sql->param_name)); \
DBUG_PRINT("info",("spider " title_name "=%d", direct_sql->param_name)); \
} \
break; \
}
#define SPIDER_PARAM_LONGLONG(title_name, param_name, min_val) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (direct_sql->param_name == -1) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -1022,7 +1022,7 @@ int spider_udf_direct_sql_get_server(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%lld", \
DBUG_PRINT("info",("spider " title_name "=%lld", \
direct_sql->param_name)); \
} \
break; \
......
storage/spider/spd_table.cc
View file @ 22ebf3cb
......@@ -1500,7 +1500,7 @@ static int spider_set_ll_value(
#define SPIDER_PARAM_STR(title_name, param_name) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (!share->param_name) \
{ \
if ((share->param_name = spider_get_string_between_quote( \
......@@ -1512,7 +1512,7 @@ static int spider_set_ll_value(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%s", share->param_name)); \
DBUG_PRINT("info",("spider " title_name "=%s", share->param_name)); \
} \
break; \
}
......@@ -1521,7 +1521,7 @@ static int spider_set_ll_value(
#define SPIDER_PARAM_STR_LIST(title_name, param_name) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (!share->param_name) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -1547,7 +1547,7 @@ static int spider_set_ll_value(
#define SPIDER_PARAM_HINT(title_name, param_name, check_length, max_size, append_method) \
if (!strncasecmp(tmp_ptr, title_name, check_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
DBUG_PRINT("info",("spider max_size=%d", max_size)); \
int hint_num = atoi(tmp_ptr + check_length); \
DBUG_PRINT("info",("spider hint_num=%d", hint_num)); \
......@@ -1566,7 +1566,7 @@ static int spider_set_ll_value(
if ((error_num = \
append_method(&share->param_name[hint_num], hint_str))) \
goto error; \
DBUG_PRINT("info",("spider "title_name"[%d]=%s", hint_num, \
DBUG_PRINT("info",("spider " title_name "[%d]=%s", hint_num, \
share->param_name[hint_num].ptr())); \
} else { \
error_num = ER_SPIDER_INVALID_CONNECT_INFO_NUM; \
......@@ -1579,7 +1579,7 @@ static int spider_set_ll_value(
#define SPIDER_PARAM_NUMHINT(title_name, param_name, check_length, max_size, append_method) \
if (!strncasecmp(tmp_ptr, title_name, check_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
DBUG_PRINT("info",("spider max_size=%d", max_size)); \
int hint_num = atoi(tmp_ptr + check_length); \
DBUG_PRINT("info",("spider hint_num=%d", hint_num)); \
......@@ -1598,7 +1598,7 @@ static int spider_set_ll_value(
if ((error_num = \
append_method(&share->param_name[hint_num], hint_str))) \
goto error; \
DBUG_PRINT("info",("spider "title_name"[%d]=%lld", hint_num, \
DBUG_PRINT("info",("spider " title_name "[%d]=%lld", hint_num, \
share->param_name[hint_num])); \
} else { \
error_num = ER_SPIDER_INVALID_CONNECT_INFO_NUM; \
......@@ -1613,7 +1613,7 @@ static int spider_set_ll_value(
min_val, max_val) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (!share->param_name) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -1640,7 +1640,7 @@ static int spider_set_ll_value(
min_val, max_val) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (!share->param_name) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -1665,7 +1665,7 @@ static int spider_set_ll_value(
#define SPIDER_PARAM_INT_WITH_MAX(title_name, param_name, min_val, max_val) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (share->param_name == -1) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -1682,14 +1682,14 @@ static int spider_set_ll_value(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%d", share->param_name)); \
DBUG_PRINT("info",("spider " title_name "=%d", share->param_name)); \
} \
break; \
}
#define SPIDER_PARAM_INT(title_name, param_name, min_val) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (share->param_name == -1) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -1704,14 +1704,14 @@ static int spider_set_ll_value(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%d", share->param_name)); \
DBUG_PRINT("info",("spider " title_name "=%d", share->param_name)); \
} \
break; \
}
#define SPIDER_PARAM_DOUBLE(title_name, param_name, min_val) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (share->param_name == -1) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -1726,14 +1726,14 @@ static int spider_set_ll_value(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%f", share->param_name)); \
DBUG_PRINT("info",("spider " title_name "=%f", share->param_name)); \
} \
break; \
}
#define SPIDER_PARAM_LONGLONG(title_name, param_name, min_val) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info",("spider "title_name" start")); \
DBUG_PRINT("info",("spider " title_name " start")); \
if (share->param_name == -1) \
{ \
if ((tmp_ptr2 = spider_get_string_between_quote( \
......@@ -1748,7 +1748,7 @@ static int spider_set_ll_value(
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info",("spider "title_name"=%lld", share->param_name)); \
DBUG_PRINT("info",("spider " title_name "=%lld", share->param_name)); \
} \
break; \
}
......
storage/xtradb/fts/fts0fts.cc
View file @ 22ebf3cb
......@@ -6274,7 +6274,7 @@ fts_fake_hex_to_dec(
#ifdef _WIN32
ret = sscanf(tmp_id, "%016llu", &dec_id);
#else
ret = sscanf(tmp_id, "%016"PRIu64, &dec_id);
ret = sscanf(tmp_id, "%016" PRIu64, &dec_id);
#endif /* _WIN32 */
ut_ad(ret == 1);
......
storage/xtradb/include/fts0priv.ic
View file @ 22ebf3cb
......@@ -53,7 +53,7 @@ fts_write_object_id(
/* Use this to construct old(5.6.14 and 5.7.3) windows
ambiguous aux table names */
DBUG_EXECUTE_IF("innodb_test_wrong_windows_fts_aux_table_name",
return(sprintf(str, "%016"PRIu64, id)););
return(sprintf(str, "%016" PRIu64, id)););
DBUG_EXECUTE_IF("innodb_test_wrong_fts_aux_table_name",
return(sprintf(str, UINT64PFx, id)););
......@@ -66,7 +66,7 @@ fts_write_object_id(
// FIXME: Use ut_snprintf(), so does following one.
return(sprintf(str, "%016llu", id));
#else /* _WIN32 */
return(sprintf(str, "%016"PRIu64, id));
return(sprintf(str, "%016" PRIu64, id));
#endif /* _WIN32 */
}
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7