Merge with global tree

mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/examples/ha_archive.cc:
  Merge with global tree
  (Use my changes)
sql/sql_parse.cc:
  Remove 'tmp' fix to be able to run tests

1 files changed, 2 insertions, 3 deletions

diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index c0b74d24d83..64061ab8978 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -773,11 +773,10 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
              file->name[2] == 'c' && file->name[3] == '\0')
     {
       /* .frm archive */
-      char newpath[FN_REFLEN], *copy_of_path;
+      char newpath[FN_REFLEN];
       MY_DIR *new_dirp;
-      uint length;
       strxmov(newpath, org_path, "/", "arc", NullS);
-      length= unpack_filename(newpath, newpath);
+      (void) unpack_filename(newpath, newpath);
       if ((new_dirp = my_dir(newpath, MYF(MY_DONT_SORT))))
       {
 	DBUG_PRINT("my",("Archive subdir found: %s", newpath));