bzr push into mysql-trunk branch (kevin.lewis:3853 to 3854)

[kevin.lewis]

 3854 kevin.lewis@stripped	2012-04-09
      Fix Windows build failure caused by revno: 3850,
      rev-id kevin.lewis@stripped

    modified:
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
 3853 Venkata Sidagam	2012-04-09 [merge]
      Null merge from 5.5 to trunk

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:venkata.sidagam@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:kevin.lewis@stripped
@@ -8611,6 +8611,7 @@ ha_innobase::parse_table_name(
 	HA_CREATE_INFO*	create_info,	/*!< in: more information of the
 					created table, contains also the
 					create statement string */
+	bool		use_tablespace,	/*!< in: srv_file_per_table */
 	char**		norm_name,	/*!< out: normalized table name */
 	char**		temp_path)	/*!< out: absolute path of table */
 {
@@ -8933,7 +8934,7 @@ ha_innobase::create(
 		DBUG_RETURN(-1);
 	}
 
-	error = parse_table_name(name, create_info,
+	error = parse_table_name(name, create_info, use_tablespace,
 				 &norm_name, &temp_path);
 	if (error) {
 		DBUG_RETURN(error);

=== modified file 'storage/innobase/handler/ha_innodb.h'
--- a/storage/innobase/handler/ha_innodb.h	revid:venkata.sidagam@stripped
+++ b/storage/innobase/handler/ha_innodb.h	revid:kevin.lewis@stripped
@@ -193,6 +193,7 @@ class ha_innobase: public handler
 	void update_create_info(HA_CREATE_INFO* create_info);
 	int parse_table_name(const char*name,
 			     HA_CREATE_INFO*create_info,
+			     bool use_tablespace,
 			     char** norm_name,
 			     char** temp_path);
 	int create(const char *name, register TABLE *form,

No bundle (reason: useless for push emails).