diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-11-20 17:18:37 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-11-20 17:18:37 +0300 |
| commit | 34b11fb627df93e395158a27f48baa1c049ddf85 (patch) | |
| tree | 126efa7bce0c3c70a1d3c3cb0099c6615f951e39 /sql/tztime.cc | |
| parent | 3937a79886f9c3a1e0c998e66565a71b4a87d984 (diff) | |
| parent | 5aeeaaf507ac87f6ff56806fe8a356cea7d4a48f (diff) | |
| download | mariadb-git-34b11fb627df93e395158a27f48baa1c049ddf85.tar.gz | |
Merge with next-mr
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index d4b7ae4b73a..8740a8ec906 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1593,7 +1593,7 @@ my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap) my_hash_free(&tz_names); goto end; } - init_alloc_root(&tz_storage, 32 * 1024, 0); + init_sql_alloc(&tz_storage, 32 * 1024, 0); VOID(pthread_mutex_init(&tz_LOCK, MY_MUTEX_INIT_FAST)); tz_inited= 1; |