Commit a2393ff2 authored by Monty's avatar Monty

Fixed wrong arguments to printf

parent a7e352b5
......@@ -13500,7 +13500,8 @@ void issue_long_find_row_warning(Log_event_type type,
"of time (%lld seconds). This is due to the fact that it is %s "
"while looking up records to be processed. Consider adding a "
"primary key (or unique key) to the table to improve "
"performance.", evt_type, table_name, delta, scan_type);
"performance.",
evt_type, table_name, (long) delta, scan_type);
}
}
}
......
......@@ -2740,7 +2740,7 @@ sf_tail_not_aggregate:
{
if (Lex->sphead->m_flags & sp_head::HAS_AGGREGATE_INSTR)
{
my_yyabort_error((ER_NOT_AGGREGATE_FUNCTION, MYF(0), ""));
my_yyabort_error((ER_NOT_AGGREGATE_FUNCTION, MYF(0)));
}
Lex->sphead->set_chistics_agg_type(NOT_AGGREGATE);
}
......@@ -2750,7 +2750,7 @@ sf_tail_aggregate:
{
if (!(Lex->sphead->m_flags & sp_head::HAS_AGGREGATE_INSTR))
{
my_yyabort_error((ER_INVALID_AGGREGATE_FUNCTION, MYF(0), ""));
my_yyabort_error((ER_INVALID_AGGREGATE_FUNCTION, MYF(0)));
}
Lex->sphead->set_chistics_agg_type(GROUP_AGGREGATE);
}
......@@ -14101,7 +14101,7 @@ opt_format_json:
else if (!my_strcasecmp(system_charset_info, $3.str, "TRADITIONAL"))
DBUG_ASSERT(Lex->explain_json==false);
else
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "JSON",
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "EXPLAIN",
$3.str));
}
;
......
......@@ -13555,7 +13555,7 @@ opt_format_json:
else if (!my_strcasecmp(system_charset_info, $3.str, "TRADITIONAL"))
DBUG_ASSERT(Lex->explain_json==false);
else
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "JSON",
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "EXPLAIN",
$3.str));
}
;
......
......@@ -1850,7 +1850,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
char tmp[10];
if (!csname || csname[0] =='?')
{
my_snprintf(tmp, sizeof(tmp), "#%d", cs_new);
my_snprintf(tmp, sizeof(tmp), "#%u", cs_new);
csname= tmp;
}
my_printf_error(ER_UNKNOWN_COLLATION,
......
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