bzr push into mysql-5.5-innodb branch (vasil.dimov:3178 to 3180)

[vasil.dimov]

 3180 Vasil Dimov	2010-09-10
      Whitespace fixup on ha_innodb.cc:9561

    modified:
      storage/innobase/handler/ha_innodb.cc
 3179 Vasil Dimov	2010-09-10
      Whitespace fixup on ha_innodb.cc:2567

    modified:
      storage/innobase/handler/ha_innodb.cc
 3178 Marko Mäkelä	2010-09-09 [merge]
      Merge Vasil Dimov 2010-09-09 Enable UNIV_DEBUG when WITH_DEBUG is defined

    modified:
      storage/innobase/CMakeLists.txt
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:marko.makela@stripped0100909121405-vvfiuolgr7iumjz7
+++ b/storage/innobase/handler/ha_innodb.cc	revid:vasil.dimov@stripped5214-lj6d1vvi2n5dux6z
@@ -2564,7 +2564,7 @@ static
 int
 innobase_start_trx_and_assign_read_view(
 /*====================================*/
-        handlerton *hton, /*!< in: Innodb handlerton */ 
+        handlerton *hton, /*!< in: Innodb handlerton */
 	THD*	thd)	/*!< in: MySQL thread handle of the user for whom
 			the transaction should be committed */
 {
@@ -9558,7 +9558,7 @@ ha_innobase::innobase_get_autoinc(
 }
 
 /*******************************************************************//**
-This function reads the global auto-inc counter. It doesn't use the 
+This function reads the global auto-inc counter. It doesn't use the
 AUTOINC lock even if the lock mode is set to TRADITIONAL.
 @return	the autoinc value */
 UNIV_INTERN

Attachment: [text/bzr-bundle] bzr/[e-mail]