bzr push into mysql-5.5-cluster-7.2 branch (Martin.Skold:3878 to 3880)

[Martin Skold]

 3880 Martin Skold	2012-03-30
      Suppressing bad cast warnings in myisam/sort.c

    modified:
      support-files/compiler_warnings.supp
 3879 Martin Skold	2012-03-30
      Regenerated result file

    modified:
      mysql-test/r/mysqldump.result
 3878 Martin Zaun	2012-03-29 [merge]
      merge from 71 to 72

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2012-03-30 06:33:44 +0000
+++ b/mysql-test/r/mysqldump.result	2012-03-30 07:51:55 +0000
@@ -5173,6 +5173,8 @@ INSERT INTO b12809202_db.t2 VALUES (1),
 -- main : logs flushed successfully!
 -- Starting transaction...
 -- Retrieving table structure for table t1...
+-- Sending SELECT query...
+-- Retrieving rows...
 --
 -- Host: localhost    Database: b12809202_db
 -- ------------------------------------------------------
@@ -5196,9 +5198,7 @@ DROP TABLE IF EXISTS `t1`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
-  `c-- Sending SELECT query...
--- Retrieving rows...
-1` int(11) DEFAULT NULL
+  `c1` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 

=== modified file 'support-files/compiler_warnings.supp'
--- a/support-files/compiler_warnings.supp	2011-10-20 19:41:56 +0000
+++ b/support-files/compiler_warnings.supp	2012-03-30 07:53:09 +0000
@@ -144,6 +144,7 @@ mytap/tap.c : C4028: formal parameter .*
 .*/ha_archive.cc          : .*C4244.* conversion .* possible loss of data
 .*/client.c               : .*C4244.* conversion .* possible loss of data
 .*/sql_update.cc          : .*C4244.* conversion .* possible loss of data
+.*/sort.c                 : .*C4244.* conversion .* possible loss of data
 
 # const qualifiers
 replace/replace.c                     : .*C4090.*

No bundle (reason: useless for push emails).