From: Georgi Kodinov
Date: August 6 2010 1:52pm
Subject: bzr commit into mysql-5.5-merge branch (Georgi.Kodinov:3165)
List-Archive: http://lists.mysql.com/commits/115216
Message-Id: <201008061352.o76DqhjT017964@magare.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8702433826234296229=="

--===============8702433826234296229==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/kgeorge/mysql/work/B54909-5.5-merge/ based on revid:bjorn.munch@stripped

 3165 Georgi Kodinov	2010-08-06 [merge]
      merge

    modified:
      support-files/my-innodb-heavy-4G.cnf.sh
=== modified file 'support-files/my-innodb-heavy-4G.cnf.sh'
--- a/support-files/my-innodb-heavy-4G.cnf.sh	2009-07-01 12:36:40 +0000
+++ b/support-files/my-innodb-heavy-4G.cnf.sh	2010-08-06 13:52:17 +0000
@@ -109,6 +109,16 @@ binlog_cache_size = 1M
 # table which could otherwise use up all memory resources.
 max_heap_table_size = 64M
 
+# Size of the buffer used for doing full table scans.
+# Allocated per thread, if a full scan is needed.
+read_buffer_size = 2M
+
+# When reading rows in sorted order after a sort, the rows are read
+# through this buffer to avoid disk seeks. You can improve ORDER BY
+# performance a lot, if set this to a high value.
+# Allocated per thread, when needed.
+read_rnd_buffer_size = 16M
+
 # Sort buffer is used to perform sorts for some ORDER BY and GROUP BY
 # queries. If sorted data does not fit into the sort buffer, a disk
 # based merge sort is used instead - See the "Sort_merge_passes"
@@ -310,16 +320,6 @@ server-id = 1
 # used for internal temporary disk tables.
 key_buffer_size = 32M
 
-# Size of the buffer used for doing full table scans of MyISAM tables.
-# Allocated per thread, if a full scan is needed.
-read_buffer_size = 2M
-
-# When reading rows in sorted order after a sort, the rows are read
-# through this buffer to avoid disk seeks. You can improve ORDER BY
-# performance a lot, if set this to a high value.
-# Allocated per thread, when needed.
-read_rnd_buffer_size = 16M
-
 # MyISAM uses special tree-like cache to make bulk inserts (that is,
 # INSERT ... SELECT, INSERT ... VALUES (...), (...), ..., and LOAD DATA
 # INFILE) faster. This variable limits the size of the cache tree in


--===============8702433826234296229==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/georgi.kodinov@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: georgi.kodinov@stripped\
#   ar2ebh3uiwe3yhhr
# target_branch: file:///home/kgeorge/mysql/work/B54909-5.5-merge/
# testament_sha1: dee25ef45571aa9a0f0410abc725888ff3f1d865
# timestamp: 2010-08-06 16:52:43 +0300
# source_branch: file:///home/kgeorge/mysql/work/B54909-5.1-bugteam/
# base_revision_id: bjorn.munch@stripped\
#   d3nmin4xq4pulwrd
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWay4HQAA0VfgAAQWOf/936K
2KC////wYAcXO+6CVRB17sZAyH0AYZTSj0mmjQNGjID1GhoAAAAElIGINAATTSnqAaaDQAaGgGqj
2p6mptJ6QGgNAMmmmgGIaZABKp5NJJ6aj0maGhNPQQwjARg0TE0G1VDINABkeoADIMgGgAASRAgE
yGgmBJiempPSZGk0epgPU6nsx2JGEX17zA7zQz1wMqO3u1CORu2e8oTTxCJ7n0thhKTRDjwjS6bK
Uxr8XKKgiQcdoc3MPGkcOKknu5FYejCI9ehWJzV8Rjcnku+d92VFnZF6TWyFheX8RcU1YgTKkMPA
iaNRgyFg3ksgEryhdmuk0gMLbpbcC3EXtKnpwmRJHgSezz6IjF0j4C75N2qxG8A4IFdvOp1Fd5Ve
fkj2KRxe3UMjSQJShWEYimWaQjaDoUerqcw/Uw2XoFJAQFYbB9End7d+nCFAUDwd/QGSQxvGIskj
GMIJ6BENpKZBVOkjao9pyC6srSRSQ5NRhQTo0OPCQ5leEIODSvg7R8GfoM6SPOmsxsDfpiSJVFWh
aaislSISSNBjcV6LPGWol9nrFarWoK6dgP/JgaCJJiTHm+YuKw2ZD26TwCA8IGLAhoQNk2ehTFcx
3CtjiSRtWyusXqdicV5pGDeT0NGIWTJobGDi6xo12EqkSvqLNowmKga7fU5MV2gwiqFb4hkwNeT3
Rc4U1phYmRLTiQmTaFWVX525EUQWUmCzOorhPCaBgwTS8lpDEzKiuo3bjlAK4GqSnOdqtcnATkg3
lcDbh2RIWVmFus3QPBZqWzFc7S9b0F8YqfA5OoWh2aix1yWaRCI9bFoX2Djfh2VDygjTNE88whwZ
FzLoJIekMl33sknZXVCYnfYPLWXjbmBHSnz1UlRPYwqQVRQyhCj3lCBoSvLhV2GPuvRVcCscyGMK
yoZJECZwnIvxeRURUVqrvUjA1PiTL/YRzttxre0uWbRWu0aClpIbPJY7byCcqMjuxdXLDTC95FQT
zhEiOK4mRkTM0nmM5BwoQExOg8wolSQxcfIGPkbis2bmaAweZ+hqOhr7CdAbLi+xmQSAuCKOoZdL
6LA83kJiLlp3ASPmpeSyExbKkAfGJnE+YMUDKIGfPQcjl47KjtiF131wQLK9hmFJsZWDCZbzjweG
MNcDq8moFdIEPuFLTgWPLKAMbAmY19Om+3ZuWSDiR/jXJmAcztB5MKsKhdGkRcfwNO6DDRot6BHR
kTNO/2vqPoZdM9Z7xidWF8PQNzjIFZ3QBvHITzmwoLIc2zI5k9fwDes1pXkplFei0TEBMWBXmKZW
ryuewxqCFSEROqRaQ+P2YxxpDqCUVrVYtrJBuYazz6x+BxJKxBJBOti5UEoiD4wKCkpicTATAqag
LVqBxTLEKGLAHg1oaKLsghsoODsZqHnk5583ONP/kA5bSQVB4iYX6hkgNmfocR+cSAR5m1zmUOBI
JWgVCgRPPiG4W59zDnBS2SgOPyJ49TRHptJHFhEZmAeYvqeJ8TWcdcNjLsYA+4OjkSdrLWF9CupA
1PsewzoYcZ66Wk0I3iI9Cw1KYmScDQGKs7Ew7+/YWuhaeiHGbYiCEcyC3rSbjVgvmJjyoXHQPnh5
9AJhNQXslbpVPSXhEhH76mo4pHgXlcGbAT1n0DmJwf5hi488a4F0DDlyD2yTMJF1+/CXAe9AUeKs
tuIwKQIjoLCdyBOL27VnA/scrPD8w9BECkl5CE7HMTnXexeDb1yKEyISzFM7lQf9lUVGZCBdcJzw
We0mtMg+Iay1WCaaVhEmVii7K8uD6IgLETIRwLJCIMJhep6FwjluKxe4ZICWNKahPvt1hBRQty/N
FNgCnBPqiE0hiGLES0MI1bv7t8tiEOupWK/qMMJrg5SCCsLgzEfCaqKZnIPqsgdeq4Bo43bA7m4y
6uH0Ip/JoiY7jBNJH3GS4FSee6s7uw2yERDkSIVqaEN8vIgCczEdcYcS5qygVmIh+gwuJjwZvdoF
Ce2gjDcaAuPrUGdkc29QqPwI8WZjMpiA4op7w4sN/wtPY+wxjiSGLkvW0fLCWrtsJDHkGGsjA/F5
sbdRQOZIcCRZAvDkSICLUrknYWwpxEUDbb4i+83+gsMQqV/qLQ68QeVfyY9WSCLZCjkG0C5JxT1G
SqN4iyzQG4uDurxZFp+I44OHGApA3Y6lXXATn/F3JFOFCQZrLgdA


--===============8702433826234296229==--