Skip to content

Commit a2393ff

Browse files
committed
Fixed wrong arguments to printf
1 parent a7e352b commit a2393ff

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

sql/log_event.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13500,7 +13500,8 @@ void issue_long_find_row_warning(Log_event_type type,
1350013500
"of time (%lld seconds). This is due to the fact that it is %s "
1350113501
"while looking up records to be processed. Consider adding a "
1350213502
"primary key (or unique key) to the table to improve "
13503-
"performance.", evt_type, table_name, delta, scan_type);
13503+
"performance.",
13504+
evt_type, table_name, (long) delta, scan_type);
1350413505
}
1350513506
}
1350613507
}

sql/sql_yacc.yy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2740,7 +2740,7 @@ sf_tail_not_aggregate:
27402740
{
27412741
if (Lex->sphead->m_flags & sp_head::HAS_AGGREGATE_INSTR)
27422742
{
2743-
my_yyabort_error((ER_NOT_AGGREGATE_FUNCTION, MYF(0), ""));
2743+
my_yyabort_error((ER_NOT_AGGREGATE_FUNCTION, MYF(0)));
27442744
}
27452745
Lex->sphead->set_chistics_agg_type(NOT_AGGREGATE);
27462746
}
@@ -2750,7 +2750,7 @@ sf_tail_aggregate:
27502750
{
27512751
if (!(Lex->sphead->m_flags & sp_head::HAS_AGGREGATE_INSTR))
27522752
{
2753-
my_yyabort_error((ER_INVALID_AGGREGATE_FUNCTION, MYF(0), ""));
2753+
my_yyabort_error((ER_INVALID_AGGREGATE_FUNCTION, MYF(0)));
27542754
}
27552755
Lex->sphead->set_chistics_agg_type(GROUP_AGGREGATE);
27562756
}
@@ -14101,7 +14101,7 @@ opt_format_json:
1410114101
else if (!my_strcasecmp(system_charset_info, $3.str, "TRADITIONAL"))
1410214102
DBUG_ASSERT(Lex->explain_json==false);
1410314103
else
14104-
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "JSON",
14104+
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "EXPLAIN",
1410514105
$3.str));
1410614106
}
1410714107
;

sql/sql_yacc_ora.yy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13555,7 +13555,7 @@ opt_format_json:
1355513555
else if (!my_strcasecmp(system_charset_info, $3.str, "TRADITIONAL"))
1355613556
DBUG_ASSERT(Lex->explain_json==false);
1355713557
else
13558-
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "JSON",
13558+
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "EXPLAIN",
1355913559
$3.str));
1356013560
}
1356113561
;

sql/table.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1850,7 +1850,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
18501850
char tmp[10];
18511851
if (!csname || csname[0] =='?')
18521852
{
1853-
my_snprintf(tmp, sizeof(tmp), "#%d", cs_new);
1853+
my_snprintf(tmp, sizeof(tmp), "#%u", cs_new);
18541854
csname= tmp;
18551855
}
18561856
my_printf_error(ER_UNKNOWN_COLLATION,

0 commit comments

Comments
 (0)