diff options
| author | unknown <monty@mysql.com> | 2005-11-24 04:08:07 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-11-24 04:08:07 +0200 |
| commit | c5349d884557ba7706a35e38c8cb35da1d332e00 (patch) | |
| tree | 439a23033b6cb0f1815201ada8b600383b2c6aef /sql/tztime.cc | |
| parent | 039168c2fa724b9ed87ce2f19a7ea20acbd8a1de (diff) | |
| parent | 81b2bbac056f21b0783f21a5830c07aba4850d85 (diff) | |
| download | mariadb-git-c5349d884557ba7706a35e38c8cb35da1d332e00.tar.gz | |
Merge mysql.com:/home/my/mysql-5.1
into mysql.com:/home/my/mysql-5.1-TDC
sql/ha_federated.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/examples/ha_tina.cc:
Auto merged
sql/examples/ha_tina.h:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index afdbebea547..eba2f8f4a7b 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1532,6 +1532,7 @@ my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap) */ if (!(thd= new THD)) DBUG_RETURN(1); + thd->thread_stack= (char*) &thd; thd->store_globals(); /* Init all memory structures that require explicit destruction */ |