bzr push into mysql-trunk branch (kevin.lewis:4021 to 4022)

[kevin.lewis]

 4022 kevin.lewis@stripped	2012-06-15
      Compiler warning, unused variable.

    modified:
      storage/innobase/fil/fil0fil.cc
 4021 kevin.lewis@stripped	2012-06-15 [merge]
      Merge with mysql-trunk

    added:
      packaging/WiX/mysqlcommandlineshell.ico
    modified:
      packaging/WiX/CMakeLists.txt
      packaging/WiX/mysql_server.wxs.in
=== modified file 'storage/innobase/fil/fil0fil.cc'
--- a/storage/innobase/fil/fil0fil.cc	revid:kevin.lewis@stripped
+++ b/storage/innobase/fil/fil0fil.cc	revid:kevin.lewis@stripped
@@ -3225,7 +3225,6 @@ fil_create_new_single_table_tablespace(
 	byte*		buf2;
 	byte*		page;
 	char*		path;
-	const char*	fsp_name;
 	ibool		success;
 	/* TRUE if a table is created with CREATE TEMPORARY TABLE */
 	bool		is_temp = !!(flags2 & DICT_TF2_TEMPORARY);

No bundle (reason: useless for push emails).