database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

Fixed wrong arguments to printf

Browse Source
This commit is contained in:
Monty
2018-01-07 23:53:42 +02:00
parent a7e352b54d
commit a2393ff22e
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/log_event.cc
View File

@@ -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 " "of time (%lld seconds). This is due to the fact that it is %s "
"while looking up records to be processed. Consider adding a " "while looking up records to be processed. Consider adding a "
"primary key (or unique key) to the table to improve " "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);
} }
} }
} }

6
sql/sql_yacc.yy
View File

@@ -2740,7 +2740,7 @@ sf_tail_not_aggregate:
{ {
if (Lex->sphead->m_flags & sp_head::HAS_AGGREGATE_INSTR) 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); 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)) 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); 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")) else if (!my_strcasecmp(system_charset_info, $3.str, "TRADITIONAL"))
DBUG_ASSERT(Lex->explain_json==false); DBUG_ASSERT(Lex->explain_json==false);
else else
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "JSON", my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "EXPLAIN",
$3.str)); $3.str));
} }
; ;

2
sql/sql_yacc_ora.yy
View File

@@ -13555,7 +13555,7 @@ opt_format_json:
else if (!my_strcasecmp(system_charset_info, $3.str, "TRADITIONAL")) else if (!my_strcasecmp(system_charset_info, $3.str, "TRADITIONAL"))
DBUG_ASSERT(Lex->explain_json==false); DBUG_ASSERT(Lex->explain_json==false);
else else
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "JSON", my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "EXPLAIN",
$3.str)); $3.str));
} }
; ;

2
sql/table.cc
View File

@@ -1850,7 +1850,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
char tmp[10]; char tmp[10];
if (!csname || csname[0] =='?') if (!csname || csname[0] =='?')
{ {
my_snprintf(tmp, sizeof(tmp), "#%d", cs_new); my_snprintf(tmp, sizeof(tmp), "#%u", cs_new);
csname= tmp; csname= tmp;
} }
my_printf_error(ER_UNKNOWN_COLLATION, my_printf_error(ER_UNKNOWN_COLLATION,