bzr commit into mysql-next-mr-innodb branch (jimmy.yang:3244)

[Jimmy Yang]

#At file:///home/jy/work/mysql5.6_1/mysql-next-mr-innodb/ based on revid:vasil.dimov@stripped

 3244 Jimmy Yang	2010-07-26
      Fix a test failure for innodb_monitor.test on sparc64 platform. monitor id
      needs to be extract to a ulint type before casting to monitor_id_t datatype.

    modified:
      storage/innobase/handler/ha_innodb.cc
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:vasil.dimov@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:jimmy.yang@stripped
@@ -10795,13 +10795,16 @@ innodb_monitor_update(
 {
 	monitor_info_t*	monitor_info;
 	monitor_id_t	monitor_id;
+	ulint		temp_id;
 	ulint		err_monitor = 0;
 
 	ut_a(var_ptr != NULL);
 	ut_a(save != NULL);
-	ut_a((*(monitor_id_t*) save) <= NUM_MONITOR);
 
-	monitor_id = *(const monitor_id_t*) save;
+	temp_id = *(ulint *) save;
+	ut_a(temp_id <= NUM_MONITOR);
+
+	monitor_id = (monitor_id_t) temp_id;
 
 	if (monitor_id == MONITOR_DEFAULT_START) {
 		/* If user set the variable to "default", we will


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