diff options
| author | gkodinov/kgeorge@rakia.gmz <> | 2007-02-19 17:35:19 +0200 |
|---|---|---|
| committer | gkodinov/kgeorge@rakia.gmz <> | 2007-02-19 17:35:19 +0200 |
| commit | 96a868a737369d128a0987b7eb1a25817d26fee5 (patch) | |
| tree | b6b7048f9771460fa9a484d4d76a6fc6945c87ba /sql/item.h | |
| parent | 90a69255469caf7231333275b75656e80ae2a81f (diff) | |
| parent | 8f52c5b2070f4ebd8ac3edd395451baa95661f8a (diff) | |
| download | mariadb-git-96a868a737369d128a0987b7eb1a25817d26fee5.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into rakia.gmz:/home/kgeorge/mysql/autopush/B19717-5.0-opt
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index c254578f780..7a0bdbaca8f 100644 --- a/sql/item.h +++ b/sql/item.h @@ -325,10 +325,10 @@ private: TABLE_LIST *save_first_name_resolution_table; TABLE_LIST *save_next_name_resolution_table; bool save_resolve_in_select_list; + TABLE_LIST *save_next_local; public: Name_resolution_context_state() {} /* Remove gcc warning */ - TABLE_LIST *save_next_local; public: /* Save the state of a name resolution context. */ @@ -350,6 +350,11 @@ public: context->first_name_resolution_table= save_first_name_resolution_table; context->resolve_in_select_list= save_resolve_in_select_list; } + + TABLE_LIST *get_first_name_resolution_table() + { + return save_first_name_resolution_table; + } }; /*************************************************************************/ |