diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-10 14:39:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-10 14:39:28 +0200 |
| commit | f27ca6f667f21b45325cc0f262f6aa632375be9a (patch) | |
| tree | 124795f9fb62aa21b1d053535ac2d92fa82069b0 /sql/sql_lex.cc | |
| parent | 3d46768da2a784ddc9c341d1fb03468525bd38f1 (diff) | |
| parent | 5044dae239d094582879792de7a762d3428223ce (diff) | |
| download | mariadb-git-f27ca6f667f21b45325cc0f262f6aa632375be9a.tar.gz | |
Merge 10.1 into 10.2
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 b2dd04d8fd5..c028d49d620 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -3415,6 +3415,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 */ |