diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-10-25 15:21:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-25 15:21:16 +0200 |
| commit | 04a4b4334650b2183d25a7b04c1e83c31bffb22d (patch) | |
| tree | 587654c186615669df8d81b851db711bb8ac2f62 /sql/tztime.cc | |
| parent | 37a78d6868d0e25d286299c91d5787fb6733844d (diff) | |
| parent | 60c15066db4f59e0362420d46a1ca5b6fbb30e56 (diff) | |
| download | mariadb-git-04a4b4334650b2183d25a7b04c1e83c31bffb22d.tar.gz | |
merge with 5.1
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 3f3060fbc10..25b3b0c8994 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2269,7 +2269,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)); |