From: magnus.blaudd
Date: June 23 2011 2:25pm
Subject: bzr commit into mysql-5.5-cluster-spj branch (magnus.blaudd:3371)
List-Archive: http://lists.mysql.com/commits/139767
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5868901291229420861=="

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

#At file:///data0/magnus/mysql/5.5-cluster-merge-from-spj/ based on revid:magnus.blaudd@stripped

 3371 magnus.blaudd@stripped	2011-06-23
      ndb spj
       - fix .result  file for ndb_gis due to different number of warning message

    modified:
      mysql-test/suite/ndb/r/ndb_gis.result
=== modified file 'mysql-test/suite/ndb/r/ndb_gis.result'
--- a/mysql-test/suite/ndb/r/ndb_gis.result	2011-06-23 06:59:40 +0000
+++ b/mysql-test/suite/ndb/r/ndb_gis.result	2011-06-23 14:24:19 +0000
@@ -406,8 +406,8 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	g1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	g2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using join buffer
 Warnings:
-Note	1644	Table 'g1' is not pushable: select list can't contain BLOB columns
-Note	1644	Table 'g2' is not pushable: select list can't contain BLOB columns
+Note	1709	Table 'g1' is not pushable: select list can't contain BLOB columns
+Note	1709	Table 'g2' is not pushable: select list can't contain BLOB columns
 Note	1003	select `test`.`g1`.`fid` AS `first`,`test`.`g2`.`fid` AS `second`,within(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `w`,contains(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `c`,overlaps(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `o`,equals(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `e`,disjoint(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `d`,touches(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `t`,intersects(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `i`,crosses(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `r` from `test`.`gis_geometrycollection` `g1` join `test`.`gis_geometrycollection` `g2` order by `test`.`g1`.`fid`,`test`.`g2`.`fid`
 DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 CREATE TABLE t1 (
@@ -960,8 +960,8 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	g1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	g2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using join buffer
 Warnings:
-Note	1644	Table 'g1' is not pushable: select list can't contain BLOB columns
-Note	1644	Table 'g2' is not pushable: select list can't contain BLOB columns
+Note	1709	Table 'g1' is not pushable: select list can't contain BLOB columns
+Note	1709	Table 'g2' is not pushable: select list can't contain BLOB columns
 Note	1003	select `test`.`g1`.`fid` AS `first`,`test`.`g2`.`fid` AS `second`,within(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `w`,contains(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `c`,overlaps(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `o`,equals(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `e`,disjoint(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `d`,touches(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `t`,intersects(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `i`,crosses(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `r` from `test`.`gis_geometrycollection` `g1` join `test`.`gis_geometrycollection` `g2` order by `test`.`g1`.`fid`,`test`.`g2`.`fid`
 DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 CREATE TABLE t1 (


--===============5868901291229420861==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   ioki99gful82iyos
# target_branch: file:///data0/magnus/mysql/5.5-cluster-merge-from-\
#   spj/
# testament_sha1: 9593ca7a1b452c2af66f43c2526ff3db868e65b7
# timestamp: 2011-06-23 16:25:06 +0200
# source_branch: file:///data0/magnus/mysql/5.5-cluster-spj/
# base_revision_id: magnus.blaudd@stripped\
#   lzcefhlf0ueks7ug
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYRY+VMAAaPfgAAwUOP/91IF
hAC////wUAQL2m0O7psYyu2wkomintU9T2knqeTTJppGwoAGIASiTTRpkyDTSajTQQ0PUAMgCSJM
EiPRGJpkGIaDyhoADAAAAADQaANANAJJCGjKanhTGgNU8p6htT1DTJ6TTTIKghsOJ7sPyzX6Vmum
PpJSCCeyWK2S2N0vOUJXQq8O1RVPx9R7b4NGWZqCtY4HB5AobacT5r9v79OgPDzx9pBBw9wMdA83
Ev3jlV76ZU9U5kcTYaQyBs26TmIxokdmJyqsgcuBdNJSPfNSInBQamRPc5wtQzaXYIT9Aw4wUpjT
KBETOooe+IQLyCpUCLnkFXYMy2kDLboIiO5q5TEOe6eBG0vO6wQXcz1hQOofPs2E1IZD/OjD4SK8
jzKKIWm5gYpNohPEKiQ01tD8thJ2B0W/pe3cLuxIRG17EE3WYbcOi5VueZmEBpxVxeqe8YXCWAm8
bV1xa9xc2ouRby0Ta4eWcUgk9O9PBWX04m9Yf43c24RL9xlddtJTxBRd00twbVlgNBhA8J0mkYo2
7ivuKw5+xGS0McoSEUzt1yufGzB9LQsEpbXG0VtBatJOSokB2QnTIIZYG63ThjaLA2Rx2lBNJrCY
Sm151zt38rsbOEICPsHiyY1B3frCAewdQ3BO2oT9/GCYOeXTU/3CgI7/LNI3T5sNtBGGQjUGNLcg
jfMjTvetBF2FBpjmdCgVHjqskItA3Zo+nCqNdXMGd5ZrZtoZkjrYRC1ItcFgdhsLuEpp68HYwTCH
ZsjwvEcHby2sfXws8jYGHWLE7oWV7bHuaIaddc2BieUwh27zKbc1aA3VZ2zM4xqBs7Fd10MhS0cG
a90xcK7GWVvlvviJGPAam31WGJaopguvaVM4G8gqq19du9hGbWrhl3CawcuIatm8ahmgpz9CmMRi
8ZgB1cpFfSGBNkKgmptTU810JA803hYE7P7lfCYsA12Ay2BmGXO7gKNHzM+u8r8qyORvFtDelAJu
iJl9hLkSSIueDQCSxDdqrR8SsCWtOSNd2S/h3GcclLRGu2m820aCgUkaq0RYE+RlbCwJw4pmicsY
2wjx0DfINPMqgyqyvnnEWKurG8ZRFdmEosQC9wgUw/Ui0IL5OUBdA+Au7GOKvuZk8ogWbqKQgUeO
xsmWRAA2wijcFd1pErRTycnLG6cwkMMaUOZBDp+9VylzYhLNSOAYAyWB4rTp4rCHLOZEFMZBKwGe
U8w7BwCzEKU55S77lTgakHzfjG4aNXGZcUxCQRZWtnqIa/Bdqpn1pOFLgdxGsIYQV2gJmzyPvrG7
RZvTVNjq4SHUlsTJ10S8j/xdyRThQkIRY+VM


--===============5868901291229420861==--