bzr push into mysql-trunk branch (Sunny.Bains:3146 to 3147)

[Sunny Bains]

 3147 Sunny Bains	2011-06-03
      Fix a compilation issue for non-atomic builds. Change the non-atomic increment
      and decrement functions to accept a "volatile ulint*" argument instead of
      a "ulint*" argument.
      
      Error introduced in commit of bug 11765863 fix. purge_sys->n_completed and
      purge_sys->n_submitted are declared to be volatile in that fix.
      
      Approved by Jimmy Yang over IRC.

    modified:
      storage/innobase/include/sync0sync.h
      storage/innobase/include/sync0sync.ic
 3146 Alexander Nozdrin	2011-06-02
      A follow-up for WL#5787.
      Fix wording in error-message and source code comment.

    modified:
      sql/item_inetfunc.cc
=== modified file 'storage/innobase/include/sync0sync.h'
--- a/storage/innobase/include/sync0sync.h	revid:alexander.nozdrin@stripped
+++ b/storage/innobase/include/sync0sync.h	revid:sunny.bains@stripped
@@ -807,7 +807,7 @@ os_atomic_dec_ulint_func(
 /*=====================*/
 	mutex_t*		mutex,		/*!< in: mutex guarding the
 						decrement */
-	ulint*			var,		/*!< in/out: variable to
+	volatile ulint*		var,		/*!< in/out: variable to
 						decrement */
 	ulint			delta);		/*!< in: delta to decrement */
 /**********************************************************//**
@@ -818,7 +818,7 @@ os_atomic_inc_ulint_func(
 /*=====================*/
 	mutex_t*		mutex,		/*!< in: mutex guarding the
 						increment */
-	ulint*			var,		/*!< in/out: variable to
+	volatile ulint*		var,		/*!< in/out: variable to
 						increment */
 	ulint			delta);		/*!< in: delta to increment */
 #endif /* !HAVE_ATOMIC_BUILTINS */

=== modified file 'storage/innobase/include/sync0sync.ic'
--- a/storage/innobase/include/sync0sync.ic	revid:alexander.nozdrin@stripped
+++ b/storage/innobase/include/sync0sync.ic	revid:sunny.bains@stripped
@@ -372,7 +372,7 @@ void
 os_atomic_dec_ulint_func(
 /*=====================*/
 	mutex_t*	mutex,		/*!< in: mutex guarding the dec */
-	ulint*		var,		/*!< in/out: variable to decrement */
+	volatile ulint*	var,		/*!< in/out: variable to decrement */
 	ulint		delta)		/*!< in: delta to decrement */
 {
 	mutex_enter(mutex);
@@ -393,7 +393,7 @@ void
 os_atomic_inc_ulint_func(
 /*=====================*/
 	mutex_t*	mutex,		/*!< in: mutex guarding the increment */
-	ulint*		var,		/*!< in/out: variable to increment */
+	volatile ulint*	var,		/*!< in/out: variable to increment */
 	ulint		delta)		/*!< in: delta to increment */
 {
 	mutex_enter(mutex);

No bundle (reason: useless for push emails).