diff options
| author | dlenev@brandersnatch.localdomain <> | 2004-08-10 12:42:31 +0400 |
|---|---|---|
| committer | dlenev@brandersnatch.localdomain <> | 2004-08-10 12:42:31 +0400 |
| commit | f49d4f5350299e31ec4176210e2d457795fb5ed8 (patch) | |
| tree | 4016d026abe9ef6a9eb602093cce08af13970126 /sql/lex.h | |
| parent | bcbbfc3bb84b490d0f16d555c5e21b96dc105c23 (diff) | |
| download | mariadb-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/lex.h')
| -rw-r--r-- | sql/lex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h index 218a1762a5c..c64a7069c32 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -499,7 +499,7 @@ static SYMBOL sql_functions[] = { { "CONNECTION_ID", F_SYM(FUNC_ARG0),0,CREATE_FUNC(create_func_connection_id)}, { "CONTAINS", F_SYM(FUNC_ARG2),0,CREATE_FUNC_GEOM(create_func_contains)}, { "CONV", F_SYM(FUNC_ARG3),0,CREATE_FUNC(create_func_conv)}, - { "CONVERT_TZ", F_SYM(FUNC_ARG3),0,CREATE_FUNC(create_func_convert_tz)}, + { "CONVERT_TZ", SYM(CONVERT_TZ_SYM)}, { "COUNT", SYM(COUNT_SYM)}, { "COS", F_SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_cos)}, { "COT", F_SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_cot)}, |