bk commit into 5.1 tree (msvensson:1.2591) BUG#31590

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-24 13:26:28+02:00, msvensson@stripped +1 -0
  Add warning supressions for bug#31590 and bug#26402 that gort lost when
  moving the supressions from perl to SQL

  mysql-test/include/mtr_warnings.sql@stripped, 2008-04-24 13:26:21+02:00, msvensson@stripped +9 -0
    Add warning supressions for bug#31590 and bug#26402 that gort lost when
    moving the supressions from perl to SQL

diff -Nrup a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
--- a/mysql-test/include/mtr_warnings.sql	2008-04-09 14:38:40 +02:00
+++ b/mysql-test/include/mtr_warnings.sql	2008-04-24 13:26:21 +02:00
@@ -201,6 +201,15 @@ INSERT INTO global_supressions VALUES
  ("Slave: Can't DROP 'c7'.* 1091"),
  ("Slave: Key column 'c6'.* 1072"),
 
+ /* Test case for Bug#31590 in order_by.test produces the following error */
+ ("Out of sort memory; increase server sort buffer size"),
+
+ /* Special case for Bug #26402 in show_check.test
+    - Question marks are not valid file name parts on Windows. Ignore
+      this error message.
+  */
+ ("Can't find file: '.\\\\test\\\\\\?{8}.frm'"),
+
  ("THE_LAST_SUPPRESSION")||