From: Ole John Aske
Date: December 8 2010 7:58am
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3393)
List-Archive: http://lists.mysql.com/commits/126289
Message-Id: <20101208075836.1F01B223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7087531363825901618=="

--===============7087531363825901618==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:ole.john.aske@stripped

 3393 Ole John Aske	2010-12-08
      SPJ-scan-scan: Adding a missing '--sorted_result' spec to ndb_condition_pushdown.test.

    modified:
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test
=== modified file 'mysql-test/suite/ndb/r/ndb_condition_pushdown.result'
--- a/mysql-test/suite/ndb/r/ndb_condition_pushdown.result	2010-12-07 17:27:02 +0000
+++ b/mysql-test/suite/ndb/r/ndb_condition_pushdown.result	2010-12-08 07:58:31 +0000
@@ -2294,9 +2294,9 @@ where table2.pk1 in (0,3) and
 (table1.pk1 = 7 or table2.pk1 = 3);
 pk1	pk1	pk2	pk2
 1	3	0	0
-4	3	0	0
-3	3	0	0
 2	3	0	0
+3	3	0	0
+4	3	0	0
 drop table t;
 set engine_condition_pushdown = @old_ecpd;
 DROP TABLE t1,t2,t3,t4,t5;

=== modified file 'mysql-test/suite/ndb/t/ndb_condition_pushdown.test'
--- a/mysql-test/suite/ndb/t/ndb_condition_pushdown.test	2010-12-07 17:27:02 +0000
+++ b/mysql-test/suite/ndb/t/ndb_condition_pushdown.test	2010-12-08 07:58:31 +0000
@@ -2358,6 +2358,8 @@ set engine_condition_pushdown=1;
 # '(table1.pk1 = 7 or table2.pk1 = 3)' as a pushable cond.
 # for 'table2'
 #
+
+--sorted_result
 select table1.pk1, table2.pk1, table1.pk2, table2.pk2
  from t as table1, t as table2
  where table2.pk1 in (0,3) and


--===============7087531363825901618==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   pcchhrs9dovzsu9l
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: 13bf96e211a6f669182768b8f4dee79d8c4042d3
# timestamp: 2010-12-08 08:58:36 +0100
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0-spj/
# base_revision_id: ole.john.aske@stripped\
#   10htessx2apylwp2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZJ4JjIAAhxfgEAwUOP/93IQ
yAC////wUASZPDdqrOxSm21TCSimajE00000GTKbFMnqYg0bUNASokelPZNMmVP0miY1AwTACZMg
JFAKNTNJ6U8npGp6I/VGnqaD01DQPQwGgAAGgAAAAACSRNDQAmpmTIRqfpNGlNBoaM013mgd5g8Z
ekDny/T6UNFobU7teNAmwMTcQreSjL7U2HkWG2Nr8+a2bJ11cKEjS4tObgdR9/C6Gln46eftoKaW
o3sCejY/TrO8k1RH1vDEwRjuKq5a0TBghQN2wVjGGs+Q7bwPfDIVcjU6i3g89jErRKRgk1axqHmB
7rpF0d0RDMO+HVcAgyAgJY2o1pJKQZEqNAJRwDvUlRBSErojIpS6gVvftKhesjgqvNO+aJbt00s0
6FcG4pfu6+OGLw/lW/erIsJjILkRIPY4Zcs76yctJ7DJg2n4NbQjNAXBUhWDBdayNTWmZnLIZnjR
FR3xR5dEMmX6GG4+MRk5cRrdlAsoNmcUOUPgWpyskMai8NpRoMK/ZC/KgbwZSAwUExweWrXexLpz
sbSc3GFYc0UaTARH+npfGEFXHnic6lKZBFDCx5esmaRoFjrZGIiYUYGBWKYsh27VyMxnWlnVcjFA
5whirdIUkXW2g60wJhZ6Qrv1AfD3gVIlIgtg6pr01xe1YmBaKUTUzsYgSEbH72JqiouOpcOlI/gB
4/8gd3brzCd17D9LnhBa2KcQdXNWRWzyW/fbUNmg1ox5ndMSsPMNNv0h/JZf1+1Lq0lUEEo6Dd8q
ClmmSDUM54k7ePESjrrLSgzuRx0GhyeZlRBeZUuAlQuEczLLTN2M4GSCGx4NfMDMm7HEccQ3ATR2
pLdMwMnMJeuQlH8JaGphmY3wMvYrxp4l4RBu8kqKiUgg/9xhxyWkqXMh9AsAZU/HpmgDGgacZY7f
ak7FZQJTcMiblMiHiSWsxFNd2dk5DFYy7BpDYuyYGyd62WnhIgaYCceh+AfXQmPJx2uxNddFOq/+
NjwfkrNHnbUZ53vFV4Hk+Q2aFO4DZJdQPnyRcjQ6dOZL15oY7oOUwsRqvRFod3o0v8hyIEtyPGMh
Sa+btt0D4I8j3PAlicjnZ6DnFiSzRz8x5nofREWOgQR5OR87FYlYJOCa021vCop+6IoX1uLs5Nk8
pPO8y76zmu11K+NKEBLcoxYjMZ40RUORPuKpUdE7wppE8wGK2LzKLNIVdB33YJQmpGBOmDb4Ek+C
ZKMTl8iVaLFgez1vvSPY5yi1QxrewwcQJqVu8hdlXglwR4GoqHbJz4K4EcZoJcXn8etWlZZ/HCS/
YCUmYNAJbt4QrTmiYpQ5IefbAS9SgN/K4yMm3uNsvctuF7EYI7AOsio4I44ODtSPZOR+wSJqDgV4
zo0KS4GpznsKEuk1aLAlYIPA6GTDi3Y83hzS696FKZ5I/g9+2IE4y3oohxrRAiZbBqLp1nRzzLGo
qNa2kMj4H+LuSKcKEhJPBMZA


--===============7087531363825901618==--