summaryrefslogtreecommitdiff
path: root/sql/tztime.cc
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2009-12-16 11:33:54 +0300
committerKonstantin Osipov <kostja@sun.com>2009-12-16 11:33:54 +0300
commit980e8b413e89175d8fc7f867415712589bead9ff (patch)
tree765dbf44bc16c28e3d63a3439bed89b86e4b92fc /sql/tztime.cc
parentd1dfce06b254548e108deabfe8a7e6b759984d5d (diff)
parent376cf4275f28f6b8167eaf19b2c66dee41fbc5c5 (diff)
downloadmariadb-git-980e8b413e89175d8fc7f867415712589bead9ff.tar.gz
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/tztime.cc')
-rw-r--r--sql/tztime.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc
index c17b37e27fb..2ec641071ee 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -1578,7 +1578,6 @@ my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap)
DBUG_RETURN(1);
thd->thread_stack= (char*) &thd;
thd->store_globals();
- lex_start(thd);
/* Init all memory structures that require explicit destruction */
if (my_hash_init(&tz_names, &my_charset_latin1, 20,