mirror of
https://github.com/MariaDB/server.git
synced 2026-05-02 13:15:32 +02:00
mysql-5.1 -> mysql-5.5 merge
This commit is contained in:
commit
bc2e383e4a
94 changed files with 2031 additions and 1163 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue