bzr push into mysql-trunk branch (tor.didriksen:3474 to 3475) Bug#59331

[Tor Didriksen]

 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
 3474 Magne Mahre	2011-01-10 [merge]
      Merge - no conflict

    modified:
      mysql-test/r/union.result
      mysql-test/t/union.test
      sql/sql_yacc.yy
=== 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;
 

No bundle (reason: useless for push emails).