diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-06 14:06:11 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-06 14:06:11 -0400 |
| commit | ec91eea8dbae4276ff6e31a0d80c0b523f88ed88 (patch) | |
| tree | 8d1b9adecf56764c4198a42c3df6dbb1096ce49a /sql/sql_show.cc | |
| parent | e4e55f7968d961e0cb07800397bc3108f960956a (diff) | |
| parent | c722e5f25f1f00b32f9b4b556f07489bda38095a (diff) | |
| download | mariadb-git-ec91eea8dbae4276ff6e31a0d80c0b523f88ed88.tar.gz | |
Local merge of mariadb-5.5.39
bzr merge -r4264 maria/5.5
Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 78c326c9e82..8aeae85e6bb 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -7711,8 +7711,9 @@ bool get_schema_tables_result(JOIN *join, Warnings_only_error_handler err_handler; thd->push_internal_handler(&err_handler); old_proc_info= thd_proc_info(thd, "Filling schema table"); - - for (JOIN_TAB *tab= first_linear_tab(join, WITH_CONST_TABLES); + + JOIN_TAB *tab; + for (tab= first_linear_tab(join, WITHOUT_BUSH_ROOTS, WITH_CONST_TABLES); tab; tab= next_linear_tab(join, tab, WITHOUT_BUSH_ROOTS)) { |