mysql-5.1 -> mysql-5.5 merge

This commit is contained in:
Sergei Golubchik 2010-11-05 10:59:51 +01:00
commit bc2e383e4a
94 changed files with 2031 additions and 1163 deletions

View file

@ -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);