diff options
| author | konstantin@oak.local <> | 2003-12-19 20:52:13 +0300 |
|---|---|---|
| committer | konstantin@oak.local <> | 2003-12-19 20:52:13 +0300 |
| commit | d37da004f6ffb32d170ce4cb9d93ba166de5b6b0 (patch) | |
| tree | a4c72a1d62170f1e5637ed34fd09ada369f1c764 /sql/item_create.cc | |
| parent | c49773237d2bb807e10ffb66c321f87a20f1e1c6 (diff) | |
| download | mariadb-git-d37da004f6ffb32d170ce4cb9d93ba166de5b6b0.tar.gz | |
THD::lex now points to THD::main_lex like in 5.0
All tests pass (client_test included)
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 1c0588b06a8..f61b87ebe88 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -76,7 +76,7 @@ Item *create_func_ceiling(Item* a) Item *create_func_connection_id(void) { THD *thd=current_thd; - thd->lex.safe_to_cache_query=0; + thd->lex->safe_to_cache_query= 0; return new Item_int(NullS,(longlong) ((thd->slave_thread) ? thd->variables.pseudo_thread_id : @@ -148,7 +148,7 @@ Item *create_func_floor(Item* a) Item *create_func_found_rows(void) { THD *thd=current_thd; - thd->lex.safe_to_cache_query=0; + thd->lex->safe_to_cache_query= 0; return new Item_int(NullS,(longlong) thd->found_rows(),21); } @@ -159,7 +159,7 @@ Item *create_func_from_days(Item* a) Item *create_func_get_lock(Item* a, Item *b) { - current_thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT); + current_thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); return new Item_func_get_lock(a, b); } @@ -324,7 +324,7 @@ Item *create_func_radians(Item *a) Item *create_func_release_lock(Item* a) { - current_thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT); + current_thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); return new Item_func_release_lock(a); } @@ -445,7 +445,7 @@ Item *create_func_year(Item* a) Item *create_load_file(Item* a) { - current_thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT); + current_thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); return new Item_load_file(a); } @@ -472,13 +472,13 @@ Item *create_func_cast(Item *a, Cast_target cast_type, int len, Item *create_func_is_free_lock(Item* a) { - current_thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT); + current_thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); return new Item_func_is_free_lock(a); } Item *create_func_is_used_lock(Item* a) { - current_thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT); + current_thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); return new Item_func_is_used_lock(a); } |