bzr push into mysql-trunk-wl5522 branch (marko.makela:4075 to 4077)

[marko.makela]

 4077 Marko Mäkelä	2012-04-18
      White space cleanup.

    modified:
      mysql-test/suite/innodb/t/innodb_mysql.test
      storage/innobase/fil/fil0fil.cc
      storage/innobase/row/row0mysql.cc
 4076 Marko Mäkelä	2012-04-18
      Revert a non-functional change in WL#5522.

    modified:
      storage/innobase/buf/buf0lru.cc
 4075 Marko Mäkelä	2012-04-18
      WL#5522: Remove trailing space from code and tests.

    modified:
      mysql-test/suite/sys_vars/r/innodb_purge_run_now_basic.result
      mysql-test/suite/sys_vars/r/innodb_purge_stop_now_basic.result
      mysql-test/suite/sys_vars/t/innodb_purge_run_now_basic.test
      mysql-test/suite/sys_vars/t/innodb_purge_stop_now_basic.test
      storage/innobase/btr/btr0btr.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/mtr/mtr0mtr.cc
      storage/innobase/row/row0import.cc
      storage/innobase/row/row0mysql.cc
=== modified file 'mysql-test/suite/innodb/t/innodb_mysql.test'
--- a/mysql-test/suite/innodb/t/innodb_mysql.test	revid:marko.makela@stripped
+++ b/mysql-test/suite/innodb/t/innodb_mysql.test	revid:marko.makela@stripped
@@ -1003,4 +1003,5 @@ ALTER TABLE t1 DROP INDEX a, ADD INDEX (
 
 DROP TABLE t1;
 
+
 --echo End of 6.0 tests

=== modified file 'storage/innobase/buf/buf0lru.cc'
--- a/storage/innobase/buf/buf0lru.cc	revid:marko.makela@stripped20120418081223-lo1wmvdv7da8yi0y
+++ b/storage/innobase/buf/buf0lru.cc	revid:marko.makela@stripped-44o0ueyat7eju2zt
@@ -359,6 +359,7 @@ buf_flush_yield(
 	mutex_t*	block_mutex;
 
 	ut_ad(buf_pool_mutex_own(buf_pool));
+	ut_ad(buf_page_in_file(bpage));
 
 	block_mutex = buf_page_get_mutex(bpage);
 
@@ -367,11 +368,11 @@ buf_flush_yield(
 	changed after we release the buffer pool and
 	block mutexes. */
 	buf_page_set_sticky(bpage);
-	mutex_exit(block_mutex);
 
 	/* Now it is safe to release the buf_pool->mutex. */
 	buf_pool_mutex_exit(buf_pool);
 
+	mutex_exit(block_mutex);
 	/* Try and force a context switch. */
 	os_thread_yield();
 

=== modified file 'storage/innobase/fil/fil0fil.cc'
--- a/storage/innobase/fil/fil0fil.cc	revid:marko.makela@stripped1wmvdv7da8yi0y
+++ b/storage/innobase/fil/fil0fil.cc	revid:marko.makela@stripped
@@ -3462,7 +3462,7 @@ fil_reset_space_and_lsn(
 	}
 
 	DBUG_EXECUTE_IF("ib_reset_space_and_lsn_post_flush_crash",
-		       	DBUG_SUICIDE(););
+			DBUG_SUICIDE(););
 
 func_exit:
 	os_file_close(file);

=== modified file 'storage/innobase/row/row0mysql.cc'
--- a/storage/innobase/row/row0mysql.cc	revid:marko.makela@stripped-lo1wmvdv7da8yi0y
+++ b/storage/innobase/row/row0mysql.cc	revid:marko.makela@strippedju2zt
@@ -2827,7 +2827,7 @@ row_discard_tablespace(
 
 	/* Update the index root pages in the system tables, on disk */
 
-    	err = row_import_update_index_root(trx, table, true, true);
+	err = row_import_update_index_root(trx, table, true, true);
 
 	if (err != DB_SUCCESS) {
 		return(err);
@@ -2836,7 +2836,7 @@ row_discard_tablespace(
 	/* Assign a new space ID to the table definition so that purge
 	can ignore the changes. Update the system table on disk. */
 
-    	err = row_mysql_table_id_reassign(table, trx, &new_id);
+	err = row_mysql_table_id_reassign(table, trx, &new_id);
 
 	if (err != DB_SUCCESS) {
 		return(err);
@@ -2844,7 +2844,7 @@ row_discard_tablespace(
 
 	/* Discard the physical file that is used for the tablespace. */
 
-    	err = fil_discard_tablespace(table->space, TRUE);
+	err = fil_discard_tablespace(table->space, TRUE);
 
 	switch(err) {
 	case DB_SUCCESS:

No bundle (reason: useless for push emails).