From: Norvald H. Ryeng Date: May 2 2012 10:41am Subject: bzr push into mysql-trunk branch (norvald.ryeng:3761 to 3762) Bug#13330886 List-Archive: http://lists.mysql.com/commits/143699 X-Bug: 13330886 Message-Id: <20120502104114.AE5EE1908@atum06.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3762 Norvald H. Ryeng 2012-05-02 Bug#13330886 TOO MANY ROWS WITH ALL|ANY Post push fix. Changed test result for test explain_json_validate. modified: mysql-test/suite/explain_json_validate/r/explain_json_validate.result 3761 Tor Didriksen 2012-05-02 Followup patch for Bug#13945257 NEW COMPILATION ERRORS/WARNINGS WITH XCODE 4.3.2 Do not allocate anything on the heap in Fake_TABLE, since TABLE::~TABLE() is not virtual. modified: unittest/gunit/fake_table.h === modified file 'mysql-test/suite/explain_json_validate/r/explain_json_validate.result' --- a/mysql-test/suite/explain_json_validate/r/explain_json_validate.result 2012-02-29 11:17:52 +0000 +++ b/mysql-test/suite/explain_json_validate/r/explain_json_validate.result 2012-05-02 10:40:45 +0000 @@ -13,29 +13,29 @@ ok at line 389 ok at line 447 ok at line 509 ok at line 548 -ok at line 597 -ok at line 651 -ok at line 692 -ok at line 731 -ok at line 803 -ok at line 892 -ok at line 1000 -ok at line 1109 -ok at line 1143 -ok at line 1191 -ok at line 1225 -ok at line 1256 -ok at line 1312 -ok at line 1377 -ok at line 1452 -ok at line 1497 -ok at line 1536 -ok at line 1575 -ok at line 1606 -ok at line 1658 -ok at line 1684 -ok at line 1726 -ok at line 1773 +ok at line 599 +ok at line 653 +ok at line 694 +ok at line 733 +ok at line 805 +ok at line 894 +ok at line 1002 +ok at line 1111 +ok at line 1145 +ok at line 1193 +ok at line 1227 +ok at line 1258 +ok at line 1314 +ok at line 1379 +ok at line 1454 +ok at line 1499 +ok at line 1538 +ok at line 1577 +ok at line 1608 +ok at line 1660 +ok at line 1686 +ok at line 1728 +ok at line 1775 Validation: mysql-test/r/explain_json_none.result @@ -52,29 +52,29 @@ ok at line 378 ok at line 448 ok at line 510 ok at line 549 -ok at line 598 -ok at line 652 -ok at line 693 -ok at line 732 -ok at line 805 -ok at line 892 -ok at line 1000 -ok at line 1099 -ok at line 1133 -ok at line 1181 -ok at line 1215 -ok at line 1246 -ok at line 1302 -ok at line 1367 -ok at line 1442 -ok at line 1487 -ok at line 1526 -ok at line 1565 -ok at line 1596 -ok at line 1648 -ok at line 1674 -ok at line 1716 -ok at line 1763 +ok at line 600 +ok at line 654 +ok at line 695 +ok at line 734 +ok at line 807 +ok at line 894 +ok at line 1002 +ok at line 1101 +ok at line 1135 +ok at line 1183 +ok at line 1217 +ok at line 1248 +ok at line 1304 +ok at line 1369 +ok at line 1444 +ok at line 1489 +ok at line 1528 +ok at line 1567 +ok at line 1598 +ok at line 1650 +ok at line 1676 +ok at line 1718 +ok at line 1765 Validation: mysql-test/r/innodb_explain_json_non_select_all.result No bundle (reason: useless for push emails).