From: Tor Didriksen
Date: January 10 2011 1:23pm
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3475) Bug#59331
List-Archive: http://lists.mysql.com/commits/128291
X-Bug: 59331
Message-Id: <20110110132315.9F9463127@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6375555386448652991=="

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

#At file:///export/home/didrik/repo/trunk/ based on revid:magne.mahre@stripped

 3475 Tor Didriksen	2011-01-10
      Bug#59331 filesort with priority queue: handling of out-of-memory
      Post-push fix: the .result file was wrong on 32-bit platforms.

    modified:
      mysql-test/r/filesort_debug.result
      mysql-test/t/filesort_debug.test
=== modified file 'mysql-test/r/filesort_debug.result'
--- a/mysql-test/r/filesort_debug.result	2011-01-06 14:38:38 +0000
+++ b/mysql-test/r/filesort_debug.result	2011-01-10 13:23:11 +0000
@@ -7,5 +7,5 @@ INSERT INTO t1(f1, f2) VALUES 
 (6,"6"),(7,"7"),(8,"8"),(9,"9"),(10,"10");
 set debug= '+d,bounded_queue_init_fail';
 SELECT * FROM t1 ORDER BY f1 ASC, f0 LIMIT 1;
-ERROR HY000: Out of memory (Needed 24 bytes)
+ERROR HY000: Out of memory (Needed NN bytes)
 DROP TABLE t1;

=== modified file 'mysql-test/t/filesort_debug.test'
--- a/mysql-test/t/filesort_debug.test	2011-01-06 14:38:38 +0000
+++ b/mysql-test/t/filesort_debug.test	2011-01-10 13:23:11 +0000
@@ -10,6 +10,7 @@ INSERT INTO t1(f1, f2) VALUES 
 (6,"6"),(7,"7"),(8,"8"),(9,"9"),(10,"10");
 
 set debug= '+d,bounded_queue_init_fail';
+--replace_regex /Needed [0-9]* bytes/Needed NN bytes/
 --error 5
 SELECT * FROM t1 ORDER BY f1 ASC, f0 LIMIT 1;
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   mnj4kdllluk3wu80
# target_branch: file:///export/home/didrik/repo/trunk/
# testament_sha1: c8cb0917690d29337cbadccf550a023616bdffc0
# timestamp: 2011-01-10 14:23:15 +0100
# source_branch: file:///export/home/didrik/repo/5.5/
# base_revision_id: magne.mahre@stripped\
#   cehvirmcokxx3hsb
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa7jSSoAAfrfgAAQWHP/91ZB
1Cq////wUASZeHRO9e8nWp1dvTCSkaTJinknkyaZJsSNqZD1DTQaNAEqCZDTBTap7SmhoAAADTQA
JQpkZT0RphTRkNqAaMgGmmgASKjRqZGo0zRpNMnqMBNAAA0AkkQ00TTFPTTTTRpMk2hkmgNGgCkz
USY21D8a5GQrhfN+yBLJyE972vdNfCOyw/dhWKKqLu9AZfpoKFLMr8dszOHfPb5mC6jTTlJbd10Y
7byPsOyNG5YHUoInuc1VErxoppT9m5DrEE3WR9vHXCEZyPwhU2SqwJs2xeBtMZDptrMrao4iUiQy
1GpgmcM0xpjMRJQizMJnL1e49dhHE904r0AySH7u8eA/7wJmlRKvYcPGGfThfpQYp0AmAplOLwRx
YDIpFvKeegCQEuRJLQVyqjB1Vt8lOqMAGWQZB5KEjz5jZHBhh18GdTaSQJhAyaaaaZ3sSuCUAVve
AydQ95UwqjD8vLXhBQWAEKtc6RsYHW2lhwCC6ri7xAnmKCgOzeFgZmUqNVwXKJIa4OJ09U5jpIUm
AETLOcp02VKoM0yncbat14x8Wurt2jZGRayCrmCMrbJC7sZ8ugzxkEUZj6re8S9snDrxrbkWOB2E
LwumfYDlDiBEwte4hWVCdabw5rFWK92SchzWUOePyGEiN8hra4ScFa0tZiV4RZJ2BzuCiieLiqty
wZKrreKQa2DzeJ1QJk0FBINpd2eTnN4CnrE8pn75ox3z3ZRKRSpkGXV4zIa2E0O0FFf9h2bMe8Sy
yZi+Ma8jULGcnbNJGl/QEjN4bN20gdLj+vd3jBIwxavE2GB5cHCzXclDeQiZQ0FuRbZ1rVhHLduI
OYSwXUSvfWFZnfe7IKNhUEwM9F/FUH6KNdDSVI1rTDiBEhcr70A8mHCvbdqt0j2TxOl8qLsC0wVV
+ROZiJEM1pGJ9ia+rrcVbMyuWBVZ3oanL8yFZYCoX8mi/ZZkn55VnypUyodARaMsEQzrYZy8lLB2
w16Ky3AHCkYQKFTrmbrhi8uCYxyK5w7tbPMUuWjayOGDldiGdOI4VT6t4RislSrD5mpERspNm3o/
LEh19xZAVYk6Tk1CI5uNdDaURUgasb5K5in0vA127gGxAk78UenEFTwUSgHo0bXhzIKoSZIyCXtw
cBREBi0cgm8wu8KxLavRYCqMMH1meDwLiidIdDyCUUKCogsSDkFkjphZ8QFs4pWBlx06KSfqGsQP
gjKZf7Ukf0SZEtAZJNFY9P6zPU+gbMooTI+10bmna3WU55GaEuHSyIVIqINNxQmSu5g4raVSRtBc
l4Mad/TPNBKLmaKpa2eISv9tXYowgdoK3DU5aSxDHdpOxihLofocFzKKEgmnNB/EuiI87V9N1ohh
ZQEmIqckbqHm4CXRWrQ+weD3HmXJh3StFi8Gki4KTeBhh5d315CuAqObGhruHtfYnk/Tkq0csZQY
tAk3qTPeYROYMQRQuxWs1mNMroV65g/xdyRThQkK7jSSoA==


--===============6375555386448652991==--