5.5 merge

This commit is contained in:
Sergei Golubchik 2014-02-25 16:04:35 +01:00
commit 0b9a0a3517
1431 changed files with 5962 additions and 2175 deletions

View file

@ -562,7 +562,7 @@ int init_embedded_server(int argc, char **argv, char **groups)
opt_mysql_tmpdir=getenv("TMP");
#endif
if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0])
opt_mysql_tmpdir=(char*) DEFAULT_TMPDIR; /* purecov: inspected */
opt_mysql_tmpdir= const_cast<char*>(DEFAULT_TMPDIR); /* purecov: inspected*/
init_ssl();
umask(((~my_umask) & 0666));