Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a2393ff2
Commit
a2393ff2
authored
Jan 07, 2018
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed wrong arguments to printf
parent
a7e352b5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
sql/log_event.cc
sql/log_event.cc
+2
-1
sql/sql_yacc.yy
sql/sql_yacc.yy
+3
-3
sql/sql_yacc_ora.yy
sql/sql_yacc_ora.yy
+1
-1
sql/table.cc
sql/table.cc
+1
-1
No files found.
sql/log_event.cc
View file @
a2393ff2
...
...
@@ -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
);
}
}
}
...
...
sql/sql_yacc.yy
View file @
a2393ff2
...
...
@@ -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), "
JSO
N",
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "
EXPLAI
N",
$3.str));
}
;
...
...
sql/sql_yacc_ora.yy
View file @
a2393ff2
...
...
@@ -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), "
JSO
N",
my_yyabort_error((ER_UNKNOWN_EXPLAIN_FORMAT, MYF(0), "
EXPLAI
N",
$3.str));
}
;
...
...
sql/table.cc
View file @
a2393ff2
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment