diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-10 14:30:11 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-10 14:30:11 +0200 |
| commit | 5044dae239d094582879792de7a762d3428223ce (patch) | |
| tree | de7baaf095317ab19949f4e7fa205cf9dce44ab8 /sql/sql_lex.cc | |
| parent | 4b05d60e62ef6e21d5329a9667813df890034ff0 (diff) | |
| parent | 78e6fafcaa93bdd2cf793a82a812137eb7a779a7 (diff) | |
| download | mariadb-git-5044dae239d094582879792de7a762d3428223ce.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 6dffd99472a..19281f44771 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -3379,6 +3379,9 @@ void LEX::first_lists_tables_same() if (query_tables_last == &first_table->next_global) query_tables_last= first_table->prev_global; + if (query_tables_own_last == &first_table->next_global) + query_tables_own_last= first_table->prev_global; + if ((next= *first_table->prev_global= first_table->next_global)) next->prev_global= first_table->prev_global; /* include in new place */ |