Merge with 3.23

innobase/btr/btr0btr.c:
  Auto merged
ltconfig:
  Auto merged
innobase/include/btr0btr.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
man/isamlog.1:
  Auto merged
man/mysql.1:
  Auto merged
man/mysql_zap.1:
  Auto merged
man/isamchk.1:
  Auto merged
man/mysqlaccess.1:
  Auto merged
man/mysqladmin.1:
  Auto merged
man/mysqld_multi.1:
  Auto merged
man/mysqld.1:
  Auto merged
man/mysqld_safe.1:
  Auto merged
man/mysqldump.1:
  Auto merged
man/mysqlshow.1:
  Auto merged
man/replace.1:
  Auto merged
myisam/mi_unique.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
man/perror.1:
  Auto merged
Makefile.am:
  merge with 3.23
client/mysqltest.c:
  merge with 3.23
innobase/btr/btr0pcur.c:
  merge with 3.23 (use local file)
innobase/row/row0purge.c:
  merge with 3.23 (use local file)
scripts/mysql_fix_privilege_tables.sh:
  Merge with 3.23 (Apply debian patches)
sql/ha_innodb.cc:
  merge with 3.23 (use local file)
sql/mysqld.cc:
  Merge with 3.23 (use local file)
sql/net_serv.cc:
  Merge with 3.23 (use local file)
sql/sql_db.cc:
  Merge with 3.23 (use local file)

sql/sql_table.cc

@@ -1771,12 +1771,9 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
     /* We changed a temporary table */
     if (error)
     {
-      /* 
-       * The following function call will also free a 
-       * new_table pointer.
-       * Therefore, here new_table pointer is not free'd as it is 
-       * free'd in close_temporary() which is called by by the 
-       * close_temporary_table() function.
+      /*
+	The following function call will free the new_table pointer,
+	in close_temporary_table(), so we can safely directly jump to err
       */
       close_temporary_table(thd,new_db,tmp_name);
       goto err;