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

Merge 10.0-base -> 10.0

Browse Source
This commit is contained in:
Alexander Barkov
2013-10-16 20:20:20 +04:00
parent e5d13c1567 3bf20bc7de
commit d21f9bab33
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_explain.cc
View File

@@ -219,6 +219,8 @@ int Explain_union::print_explain(Explain_query *query,
select_result_sink *output, select_result_sink *output,
uint8 explain_flags) uint8 explain_flags)
{ {
char table_name_buffer[SAFE_NAME_LEN];
/* print all UNION children, in order */ /* print all UNION children, in order */
for (int i= 0; i < (int) union_members.elements(); i++) for (int i= 0; i < (int) union_members.elements(); i++)
{ {
@@ -238,7 +240,6 @@ int Explain_union::print_explain(Explain_query *query,
/* `table` column: something like "<union1,2>" */ /* `table` column: something like "<union1,2>" */
{ {
char table_name_buffer[SAFE_NAME_LEN];
uint childno= 0; uint childno= 0;
uint len= 6, lastop= 0; uint len= 6, lastop= 0;
memcpy(table_name_buffer, STRING_WITH_LEN("<union")); memcpy(table_name_buffer, STRING_WITH_LEN("<union"));