diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-08-10 19:19:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-08-10 19:19:05 +0200 |
| commit | 309c08c17c56d35e5635a5874fb70719935e5f54 (patch) | |
| tree | db63b0f496364456789f390eb5f693dabf0f94a1 /sql/item_subselect.h | |
| parent | c6fdb92ca829fed893d9e7324e80b1450de16087 (diff) | |
| parent | 5ad02062d928cccbd29c0a2db6f0f7ceb33195d1 (diff) | |
| download | mariadb-git-309c08c17c56d35e5635a5874fb70719935e5f54.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index c0746d08db7..0c62c3f8d02 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -751,7 +751,8 @@ public: ROWID_MERGE_ENGINE, TABLE_SCAN_ENGINE}; subselect_engine(Item_subselect *si, - select_result_interceptor *res) + select_result_interceptor *res): + thd(NULL) { result= res; item= si; @@ -767,7 +768,7 @@ public: Should be called before prepare(). */ void set_thd(THD *thd_arg); - THD * get_thd() { return thd; } + THD * get_thd() { return thd ? thd : current_thd; } virtual int prepare(THD *)= 0; virtual void fix_length_and_dec(Item_cache** row)= 0; /* |