Import mysql-5.1-new changeset 1.2011.1.1 (Alexander Barkov):

WL#1324 table name to file name encoding

ha_innobase::create(): do not remove .frm extension

row_is_mysql_tmp_table_name(): replace '#' with '@0023'

handler/ha_innodb.cc

@@ -4887,7 +4887,7 @@ ha_innobase::create(
 		srv_lower_case_table_names = FALSE;
 	}
 
-	fn_format(name2, name, "", "", 2);	// Remove the .frm extension
+	strcpy(name2, name);
 
 	normalize_table_name(norm_name, name2);
 

row/row0mysql.c

@@ -3484,7 +3484,8 @@ row_is_mysql_tmp_table_name(
 	const char*	name)	/* in: table name in the form
 				'database/tablename' */
 {
-	return(strstr(name, "/#sql") != NULL);
+	/* return(strstr(name, "/#sql") != NULL); */
+	return(strstr(name, "/@0023sql") != NULL);
 }
 
 /*************************************************************************