diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-05 10:59:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-05 10:59:51 +0100 |
| commit | bc2e383e4a0dbc1949d5b65102e843c01237e23c (patch) | |
| tree | 23bb774ead6f6cc840c11c0536f3f59c5d417aca /sql/tztime.cc | |
| parent | 4cce72a9292c98fab5628adc24c1635e315444e7 (diff) | |
| parent | 4cfa91f42c4cde9c35979cd2b9837cb60213d876 (diff) | |
| download | mariadb-git-bc2e383e4a0dbc1949d5b65102e843c01237e23c.tar.gz | |
mysql-5.1 -> mysql-5.5 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 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); |