bzr push into mysql-trunk branch (vasil.dimov:3711 to 3712)

[vasil.dimov]

 3712 Vasil Dimov	2012-01-09
      Fix some whitespace

    modified:
      storage/innobase/fts/fts0fts.cc
 3711 Raghav Kapoor	2012-01-09
      BUG#11751736 - 42708: DROP DATABASE STATEMENT SHOULD REMOVE .OLD SUFFIX FROM 
      		      DATABASE DIRECTORY
      
      BACKGROUND:
      Create database, tables and load data.Execute myisampack to
      compress the tables, also use -b option to have backup of 
      datafile.Try dropping the database, will fail because of 
      .OLD file that is created in database directory.
      	
      FIX:
      DROP DATABASE will fail with the error described in the bug report
      if an unknown file is found while trying to delete the database
      directory. This bug is fixed by adding ".OLD" to the list of known file
      extensions that DROP DATABASE uses when checking if a file can be
      silently deleted. 

    modified:
      mysql-test/r/myisampack.result
      mysql-test/t/myisampack.test
      sql/sql_db.cc
=== modified file 'storage/innobase/fts/fts0fts.cc'
--- a/storage/innobase/fts/fts0fts.cc	revid:raghav.kapoor@stripped
+++ b/storage/innobase/fts/fts0fts.cc	revid:vasil.dimov@stripped
@@ -1692,8 +1692,7 @@ ulint
 fts_create_common_tables(
 /*=====================*/
 	trx_t*		trx,			/*!< in: transaction */
-	const dict_table_t*
-			table,			/*!< in: table with FTS index */
+	const dict_table_t* table,		/*!< in: table with FTS index */
 	const char*	name,			/*!< in: table name normalized.*/
 	ibool		skip_doc_id_index)	/*!< in: Skip index on doc id */
 
@@ -1732,7 +1731,7 @@ fts_create_common_tables(
 	graph = fts_parse_sql_no_dict_lock(
 		&fts_table, NULL, fts_config_table_insert_values_sql);
 
-	error = fts_eval_sql( trx, graph);
+	error = fts_eval_sql(trx, graph);
 
 	que_graph_free(graph);
 

No bundle (reason: useless for push emails).