[Commits] b6751fa: Sergei Petrunia's addition

Oleksandr Byelkin sanja at mariadb.com
Fri Sep 2 18:24:39 EEST 2016


revision-id: b6751fa16651b041b4dad1de5efa9e5791a06ab7 (mariadb-5.5.51-7-gb6751fa)
parent(s): 8eb164928e317e31887c662e977c43c4c0c68cf9
committer: Oleksandr Byelkin
timestamp: 2016-09-02 17:24:39 +0200
message:

Sergei Petrunia's addition

---
 sql/item.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sql/item.cc b/sql/item.cc
index 1a2c519..abcf48f 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -2798,6 +2798,8 @@ void Item_field::fix_after_pullout(st_select_lex *new_parent, Item **ref)
     }
     ctx->table_list= context->first_name_resolution_table;
     ctx->select_lex= new_parent;
+    if (context->select_lex == NULL)
+      ctx->select_lex= NULL;
     ctx->first_name_resolution_table= context->first_name_resolution_table;
     ctx->last_name_resolution_table=  context->last_name_resolution_table;
     ctx->error_processor=             context->error_processor;


More information about the commits mailing list