diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-10-19 15:58:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-19 15:58:35 +0200 |
| commit | 745cc74c3301f193c7b82c31d11c3bf0c842be9e (patch) | |
| tree | 4aa6101c051c91607d2623eed26fb41527fd0bd3 /sql/tztime.cc | |
| parent | f0c6576b85a57ec82fd911f73cce7c99683b378c (diff) | |
| parent | cc6d22f5356e0969d8d5d1046edc69cb17ea19fb (diff) | |
| download | mariadb-git-745cc74c3301f193c7b82c31d11c3bf0c842be9e.tar.gz | |
5.1.51 merge
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 cd6e63be039..1277383895a 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2259,7 +2259,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); VOID(pthread_mutex_lock(&tz_LOCK)); |