From: Sergey Vojtovich
Date: April 1 2010 12:54pm
Subject: bzr commit into mysql-5.1-bugteam branch (svoj:3537) Bug#52102
List-Archive: http://lists.mysql.com/commits/104890
X-Bug: 52102
Message-Id: <0L07008CI7UPIB60@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_PpJ/RciZYF0fRE117ODONg)"

--Boundary_(ID_PpJ/RciZYF0fRE117ODONg)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#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.
+
+2010-03-18	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


--Boundary_(ID_PpJ/RciZYF0fRE117ODONg)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/svoj@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/svoj@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: svoj@stripped
# target_branch: file:///home/svoj/devel/innodb-snapshots/mysql-5.1-\
#   bugteam/
# testament_sha1: 3796e52298e0d69a904961de8762d779c10f3b4b
# timestamp: 2010-04-01 16:54:15 +0400
# base_revision_id: svoj@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTxMLFwAAn3fgEAwWX///3/v
34C////0UAWaerUgpoousAA4SRKeSnoZU9qnlPTUyNoxqnpGRtNAIyeo9MmiZNA0qaGQ0/VAGRk0
AGgaYEAAAABkQTRMaKaH6p6gaNA0BoAAAAAHGTJoxDE0wEDAmmCMExNNNABhBJIIAJpiT0JpppMJ
tU2U8ptNTyEyNGhmp5JFhkkrLvLxi2ZDlTYJ0CQkgufehmpNTOXlCxKVZSypojsdLWyKSiUIFtnf
QfqPyKMPQYF3EhmZM2vJpXv8ZWY44Hj/prs8G2oSiyphf/pX8d4uEjXt1XzI3rFQtg+J14XqTbMt
EkwP4LPtrKW6mJK5yiBreSvP9YsLnCvOeHNr0exuSvJee5a3zaldMOx7GcB6MEEllOMtdkL1jhGD
QcdneOuO/CIZxh2oYsKkKB9+DAXbSzZewOOSQDr21mxztSnRrhaCXAVnQHIQ2WwHwqnWckRXIOsC
1j3KrgSgoMAQQr9xEPb3GonEuYTClFM5iXtIlBsgjXUTeGOgwQgwAjEFWEGuggrik91N/ZNFDzBg
w2iyyzaeGNeLML6C0ViIFoqx7tLhNSsAsC5GopLMSKhWGAXtTWSPCczIWSZhnilg9DwrPsK0MXta
YlD6iwoT5CykiMBOLTUShfPkBkZj7gUmGGd02ayxyE9aG3BaVFZFXMDlMEpyi8vMVstd5bj7QtRc
LEsB4EtwGWI3rvtvzRlFgA1D4RHqkdkONcpE28XCWhcZjWHpfoeSAX58ry0LUoo8LWuV0AJhli7+
AgoMZZklQ3xHJCQBjFjw0VwmE4VSM7ZqE9MKkwLiYJy4mVhUPNRTv5+Tot4GkYspDSD8FIiLgoOV
dTJeLFVtTSDOY42vHsG8Y4/gvbdhM5JnhwiVuv1PI1KqOkTTswzDcGssaoHlQ8T0H+4UfqWG8PfS
Ve9qmefDzGGtIyfG2VUnken3IQPQLChLyhoV48g40BI4ceb5h4TzkpAdMSFaYq85cpCg4DEjf6Hf
XIiLrovDE0T5xwW0KD8DoG5EyOwfHnrkEec2CeIuUnMxZ7M5bX2M00DMikrOU01TdzUKWQmMwQnl
pESLUHisvgLE8TOd54lJiQHKro/Ovs6HIel4FBMXyhcWjE0D8anN41zQniRj8xKZVxDWrBP89xN+
/7EpmMQtDICgHXlYHgWrO3KZJ0omI4e9U4xw0VFwfvbFdKS+U5SK1FExlb5lilMi0XNCXOckiGpe
FkpIvmIgkFMQBIzTpkniQAoWZ7ANkAyjNnKEUImlg3Z0YiCvhOcRuqleBkMQbfuepMq/pxEVW7HF
zkGQymiHo20+vKeoTwdxC97lz2ugqwM6KtrTtZjxB4ASGpcGlLEwImTHGVsWo9wvXd3ZzrO/bGrQ
Iu51YI+VQ2j5mMxFBuSWs3iyDsiBrRh2AbwGhQHatoGG8p6wOkB+5iRy6aHn8kpn5goYe4zYCToj
0cj1l7ttJMEGLwkcdCyDH6TKIyLxJwHy4FR30hKkSMhwZRCBKKJgBNs0ogyTLpfUO3uFKBo3azkE
vprEpwYKRHNYTpVyIYWxyq7s8kMwoEC/WFTUrZs2BAqZRUwd4HKWnzyamkaHD7N1wF2iNbcJvZ6O
QtiBdZK4sZPmDpaWU7qBaYaTOiUiwyYxDhBg2zBBmYZtavNcGVKozEgh5KEgQ1B1aYKdEwfgSd/z
SMtA4GMM/U07i5N2uicZAIl7pLrgmn3Dx4xQEyKF/jOBlIwXfEHmn5G2kGXNSqBLWA3qFbWpnsD2
vEREtXZ7BX9YEwDAXng2QuAKUeImvWiFo573P02tKGFBwNzr0rT/i7kinChIHiYWLgA=


--Boundary_(ID_PpJ/RciZYF0fRE117ODONg)--