summaryrefslogtreecommitdiff
path: root/sql/tztime.h
diff options
context:
space:
mode:
authordlenev@brandersnatch.localdomain <>2004-12-17 15:34:48 +0300
committerdlenev@brandersnatch.localdomain <>2004-12-17 15:34:48 +0300
commitc834a49b665dd78f6545ca1148b6a996aaba40ad (patch)
tree577624a5e1b07aa6fa2e71cc63e8ca25649164a8 /sql/tztime.h
parent6461d209a56a09df664f8bfa3cfe6b804fd5594b (diff)
downloadmariadb-git-c834a49b665dd78f6545ca1148b6a996aaba40ad.tar.gz
Fix for bug #6849 "Crash while preparing query containing const expr with
IN and CONVERT_TZ()" (with after review changes). Now we add implicitly used time zone tables to global table list right at the parsing stage instead of doing it later in mysql_execute_command() or in check_prepared_statement(). No special test-case needed since this bug also manifests itself as timezone2.test failure if one runs it with --ps-protocol option.
Diffstat (limited to 'sql/tztime.h')
-rw-r--r--sql/tztime.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/tztime.h b/sql/tztime.h
index 6d2388bb160..07e9146c6e9 100644
--- a/sql/tztime.h
+++ b/sql/tztime.h
@@ -64,6 +64,7 @@ extern Time_zone * my_tz_find(const String *name, TABLE_LIST *tz_tables);
extern my_bool my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap);
extern void my_tz_free();
+extern TABLE_LIST fake_time_zone_tables_list;
/*
Check if we have pointer to the beggining of list of implictly used