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
57c37e6c
Commit
57c37e6c
authored
May 01, 2019
by
Varun Gupta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjusting sql_command to align with higher version, this is an adjustment
to the patch for MDEV-17605
parent
e9da78ee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
sql/sql_show.cc
sql/sql_show.cc
+4
-5
No files found.
sql/sql_show.cc
View file @
57c37e6c
...
@@ -4272,8 +4272,8 @@ fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys,
...
@@ -4272,8 +4272,8 @@ fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys,
SQLCOM_SHOW_FIELDS is used because it satisfies
SQLCOM_SHOW_FIELDS is used because it satisfies
'only_view_structure()'.
'only_view_structure()'.
*/
*/
lex
->
sql_command
=
SQLCOM_SHOW_FIELDS
;
thd
->
force_read_stats
=
get_schema_table_idx
(
schema_table
)
==
SCH_STATISTICS
;
thd
->
force_read_stats
=
get_schema_table_idx
(
schema_table
)
==
SCH_STATISTICS
;
lex
->
sql_command
=
SQLCOM_SHOW_FIELDS
;
result
=
(
open_temporary_tables
(
thd
,
table_list
)
||
result
=
(
open_temporary_tables
(
thd
,
table_list
)
||
open_normal_and_derived_tables
(
thd
,
table_list
,
open_normal_and_derived_tables
(
thd
,
table_list
,
(
MYSQL_OPEN_IGNORE_FLUSH
|
(
MYSQL_OPEN_IGNORE_FLUSH
|
...
@@ -4281,16 +4281,15 @@ fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys,
...
@@ -4281,16 +4281,15 @@ fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys,
(
can_deadlock
?
(
can_deadlock
?
MYSQL_OPEN_FAIL_ON_MDL_CONFLICT
:
0
)),
MYSQL_OPEN_FAIL_ON_MDL_CONFLICT
:
0
)),
DT_PREPARE
|
DT_CREATE
));
DT_PREPARE
|
DT_CREATE
));
(
void
)
read_statistics_for_tables_if_needed
(
thd
,
table_list
);
thd
->
force_read_stats
=
false
;
/*
/*
Restore old value of sql_command back as it is being looked at in
Restore old value of sql_command back as it is being looked at in
process_table() function.
process_table() function.
*/
*/
lex
->
sql_command
=
old_lex
->
sql_command
;
lex
->
sql_command
=
old_lex
->
sql_command
;
(
void
)
read_statistics_for_tables_if_needed
(
thd
,
table_list
);
thd
->
force_read_stats
=
false
;
DEBUG_SYNC
(
thd
,
"after_open_table_ignore_flush"
);
DEBUG_SYNC
(
thd
,
"after_open_table_ignore_flush"
);
/*
/*
...
...
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