bzr commit into mysql-5.1-bugteam branch (svoj:3537) Bug#52102

[Sergey Vojtovich]

#At file:///home/svoj/devel/innodb-snapshots/mysql-5.1-bugteam/ based on revid:svoj@stripped

 3537 Sergey Vojtovich	2010-04-01
      Applying InnoDB snapshot, fixes BUG#52102.
      
      Detailed revision comments:
      
      r6840 | calvin | 2010-03-19 00:32:23 +0200 (Fri, 19 Mar 2010) | 6 lines
      branches/zip: Fix Bug #52102 InnoDB Plugin shows performance drop
      comparing to builtin InnoDB (Windows only).
      
      Disable Windows atomics by default.
      
      Approved by: Inaam

    modified:
      storage/innodb_plugin/CMakeLists.txt
      storage/innodb_plugin/ChangeLog
=== modified file 'storage/innodb_plugin/CMakeLists.txt'
--- a/storage/innodb_plugin/CMakeLists.txt	2010-04-01 12:52:14 +0000
+++ b/storage/innodb_plugin/CMakeLists.txt	2010-04-01 12:53:56 +0000
@@ -80,5 +80,9 @@ SET(INNODB_PLUGIN_SOURCES	btr/btr0btr.c 
 			usr/usr0sess.c
 			ut/ut0byte.c ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c ut/ut0vec.c
 			ut/ut0list.c ut/ut0wqueue.c)
-ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DINNODB_RW_LOCKS_USE_ATOMICS -DHAVE_IB_PAUSE_INSTRUCTION)
+# Windows atomics do not perform well. Disable Windows atomics by default.
+# See bug#52102 for details.
+#ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DINNODB_RW_LOCKS_USE_ATOMICS -DHAVE_IB_PAUSE_INSTRUCTION)
+ADD_DEFINITIONS(-DHAVE_IB_PAUSE_INSTRUCTION)
+
 MYSQL_STORAGE_ENGINE(INNODB_PLUGIN)

=== modified file 'storage/innodb_plugin/ChangeLog'
--- a/storage/innodb_plugin/ChangeLog	2010-04-01 12:52:37 +0000
+++ b/storage/innodb_plugin/ChangeLog	2010-04-01 12:53:56 +0000
@@ -1,5 +1,12 @@
 2010-03-18	The InnoDB Team
 
+	* CMakeLists.txt:
+	Fix Bug #52102 InnoDB Plugin shows performance drop comparing to
+	builtin InnoDB (Windows only).
+	Disable Windows atomics by default.
+
[phone]	The InnoDB Team
+
 	* buf0buf.ic:
 	When comparing the time of the first access to a block against
 	innodb_old_blocks_time, use 32-bit arithmetics.  The comparison


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