summaryrefslogtreecommitdiff
path: root/sql/item_create.cc
diff options
context:
space:
mode:
authordlenev@brandersnatch.localdomain <>2004-08-10 12:42:31 +0400
committerdlenev@brandersnatch.localdomain <>2004-08-10 12:42:31 +0400
commitf49d4f5350299e31ec4176210e2d457795fb5ed8 (patch)
tree4016d026abe9ef6a9eb602093cce08af13970126 /sql/item_create.cc
parentbcbbfc3bb84b490d0f16d555c5e21b96dc105c23 (diff)
downloadmariadb-git-f49d4f5350299e31ec4176210e2d457795fb5ed8.tar.gz
Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server".
Instead of trying to open time zone tables during calculation of CONVERT_TZ() function or setting of @@time_zone variable we should open and lock them with the rest of statement's table (so we should add them to global table list) and after that use such pre-opened tables for loading info about time zones.
Diffstat (limited to 'sql/item_create.cc')
-rw-r--r--sql/item_create.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc
index 4290a25e348..c98c7892c26 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -89,11 +89,6 @@ Item *create_func_conv(Item* a, Item *b, Item *c)
return new Item_func_conv(a,b,c);
}
-Item *create_func_convert_tz(Item* a, Item *b, Item *c)
-{
- return new Item_func_convert_tz(a,b,c);
-}
-
Item *create_func_cos(Item* a)
{
return new Item_func_cos(a);