Merge with 3.23.54

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
  Auto merged
BitKeeper/deleted/.del-MySQLEULA.txt:
  Delete: Docs/MySQLEULA.txt
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Build-tools/mysql-copyright-2:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
heap/heapdef.h:
  Auto merged
heap/hp_open.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysys/safemalloc.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.res:
  Auto merged
Build-tools/Do-compile:
  merge
Docs/manual.texi:
  merge
configure.in:
  merge
mysql-test/r/distinct.result:
  merge
mysql-test/r/null_key.result:
  merge
sql/ha_innodb.cc:
  merge
sql/item.h:
  merge
sql/log.cc:
  merge
sql/mysqld.cc:
  merge
support-files/mysql.spec.sh:
  merge

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index d6e40889eed..2642a27cfff 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3356,10 +3356,10 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables)
   }
   if (options & REFRESH_LOG)
   {
-    mysql_log.new_file();
-    mysql_update_log.new_file();
-    mysql_bin_log.new_file();
-    mysql_slow_log.new_file();
+    mysql_log.new_file(0);
+    mysql_update_log.new_file(0);
+    mysql_bin_log.new_file(0);
+    mysql_slow_log.new_file(0);
     if (ha_flush_logs())
       result=1;
   }