diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2010-08-15 11:56:14 +0400 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2010-08-15 11:56:14 +0400 |
| commit | eebecee7d3559281e30c13027f77782aec131f29 (patch) | |
| tree | 4738931efbb3d3e34d0da2612a5709eaa585b9ef /sql/tztime.cc | |
| parent | 7f8627e36bd77bf418dbec50f10566d5917d3a1c (diff) | |
| parent | 45a87c685b1378d3840df3e391134afb01dead6f (diff) | |
| download | mariadb-git-eebecee7d3559281e30c13027f77782aec131f29.tar.gz | |
automerge 5.1-security --> 5.5-security (bug 55424)
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 43d43123158..a2f319d4307 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2300,7 +2300,7 @@ my_tz_find(THD *thd, const String *name) DBUG_PRINT("enter", ("time zone name='%s'", name ? ((String *)name)->c_ptr_safe() : "NULL")); - if (!name) + if (!name || name->is_empty()) DBUG_RETURN(0); mysql_mutex_lock(&tz_LOCK); |