From: Bjorn Munch
Date: November 19 2010 11:38am
Subject: bzr push into mysql-trunk-bugfixing branch (bjorn.munch:3363 to 3364)
List-Archive: http://lists.mysql.com/commits/124424
Message-Id: <201011191138.oAJBc43K018691@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3364 Bjorn Munch	2010-11-19 [merge]
      upmerge compilation warning fix

    modified:
      client/mysqltest.cc
 3363 Bjorn Munch	2010-11-19
      merge mistake

    modified:
      mysql-test/suite/rpl/t/rpl_packet.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-11-19 10:38:08 +0000
+++ b/client/mysqltest.cc	2010-11-19 11:37:11 +0000
@@ -5726,6 +5726,8 @@ void do_block(enum block_cmd cmd, struct
     case GE_OP:
       v.int_val= (v.int_val >= v2.int_val);
       break;
+    case ILLEG_OP:
+      die("Impossible operator, this cannot happen");
     }
 
     v.is_int= TRUE;

No bundle (reason: useless for push emails).