bzr commit into mysql-5.0-bugteam branch (joro:2804) Bug#46080

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/fix-5.0-bugteam/ based on revid:joro@stripped

 2804 Georgi Kodinov	2009-07-13
      Addendum to the fix for bug #46080: fixed the error handling

    modified:
      mysql-test/r/bug46080.result
      mysql-test/t/bug46080.test
=== modified file 'mysql-test/r/bug46080.result'
--- a/mysql-test/r/bug46080.result	2009-07-10 14:03:09 +0000
+++ b/mysql-test/r/bug46080.result	2009-07-13 11:17:14 +0000
@@ -8,7 +8,6 @@ SET @@SESSION.sort_buffer_size=5*16*1000
 SET @@SESSION.max_heap_table_size=5*1000000;
 # Must not crash.
 SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a;
-Got one of the listed errors
 DROP TABLE t1;
 SET @@SESSION.sort_buffer_size=default;
 SET @@SESSION.max_heap_table_size=default;

=== modified file 'mysql-test/t/bug46080.test'
--- a/mysql-test/t/bug46080.test	2009-07-10 14:03:09 +0000
+++ b/mysql-test/t/bug46080.test	2009-07-13 11:17:14 +0000
@@ -10,8 +10,10 @@ SET @@SESSION.sort_buffer_size=5*16*1000
 SET @@SESSION.max_heap_table_size=5*1000000;
 
 --echo # Must not crash.
---error 5,0
+--disable_result_log
+--error 0,5
 SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a;
+--enable_result_log
 
 DROP TABLE t1;
 SET @@SESSION.sort_buffer_size=default;


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