From: magnus.blaudd
Date: June 8 2011 5:34pm
Subject: bzr commit into mysql-trunk-cluster branch (magnus.blaudd:3319)
List-Archive: http://lists.mysql.com/commits/138874
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8577694500676685293=="

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

#At file:///data0/magnus/mysql/trunk-cluster/ based on revid:magnus.blaudd@stripped

 3319 magnus.blaudd@stripped	2011-06-08
      ndb
       - update .result file after changes to loaddata_autocom.inc file

    modified:
      mysql-test/suite/ndb/r/loaddata_autocom_ndb.result
=== modified file 'mysql-test/suite/ndb/r/loaddata_autocom_ndb.result'
--- a/mysql-test/suite/ndb/r/loaddata_autocom_ndb.result	2007-12-12 17:19:24 +0000
+++ b/mysql-test/suite/ndb/r/loaddata_autocom_ndb.result	2011-06-08 17:33:27 +0000
@@ -1,4 +1,4 @@
-SET SESSION STORAGE_ENGINE = ndbcluster;
+SET SESSION DEFAULT_STORAGE_ENGINE = ndbcluster;
 drop table if exists t1;
 create table t1 (id int unsigned not null auto_increment primary key, a text, b text);
 start transaction;


--===============8577694500676685293==
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\
#   jedwq9kw11cnurst
# target_branch: file:///data0/magnus/mysql/trunk-cluster/
# testament_sha1: a5bf18b0e8d180cc61595a32494828c4ebf79460
# timestamp: 2011-06-08 19:34:08 +0200
# source_branch: file:///data0/magnus/mysql/5.5-cluster/
# base_revision_id: magnus.blaudd@stripped\
#   tvqlg1ozx54d20eg
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRMi2i0AAWLfgAAQUGP//3el
ngC////wUAOHmdF03dadFBoRU3op+Umn4qZk1HqYj1AaPUNG9UeU3qgEpIYU2mImT1NTajEAAAAA
BKFPQpkDCE9TRo02oDENDQAA5gEwAmAAEwABMAASSJlPTU9TTRiajaTJ6pgEAA00yCOgb/XEPhn2
wEcxo4ivrzqFTUrYjI+ZSeT2igA8o6u7a3BtKt/7u08t1KEPvXVF04oukIYLXadloxBCHYOem0FI
XYeWOxVNHAR584izTstazTGHGC5UTngD2Mw1PQQHYYPvxQb2PInFSrWrE6zkUhJawOPjUgxMuUkF
FP4JIJPoGQuts7dl6TSlp9RlhVFomJ1M252aB0LxdQkNU4FJ8oqutQ0MkzKQKicUWW6qB8qrXvFy
EXCQZeV5GlzORwziREcdxb75GWZMSoo41NrFA5Sxc2DtReq9ibBa9Y2QrJbx0/1JMTPwD3E9NuNs
bUE1s0Dcw1sIXAouM9kWiUOMKFt3sdrxYkFDBtj3wWl65SMnvnYgXCmNyNDbFQrWwcFbI0MwaMcN
/BKpQHwtRSsFBb7DjIsVcaQRktHBsM11k689iW7mCCsZZOMyMXtvXKfAYMwYpc58GHJTsrMjTSbl
UdYEKnkdCL2a98EcYP5tN2+ZiIXR8tQhA1HsF6ly3FIKRDvrxPVPhQkakF2CGcNrhVZrmK9o3iId
2lK3O3co7+XPHChQhr87hIiG6CpPqlk6mKdzyyKbO8rSmpLxLJ4t0i8QyNRQiPlttFv4sha/wV2u
rM+Ndf1HTYAvdXBuzk1H/ArNNzjuWEKzYMz0M4oMaAZGXFaegxq4aoHCcWkJydYYFDV0bys1+w/t
7uovcZcWyOKsKkMzAhUIZGIKzepoiipj9JZbyopcSKGqkz8fuEP2d1NwYh23PxtFuuaOBoLw8ReF
QTCbg4COCmIYistdMjdadsoEqTMzvSG6HLcvImM45K2D6HcY0IRiY46GvRQqaShK0Hg8I13W2iRV
MgmQQ5h0rbTWDA+IBBSbsqPP/CNAVrrcp7O5c1Av3MyuqI6Z1Q9BdRWyYvxpzPWlmEs3QRvJ52kJ
SXVc+20UYwZOeIYfY6ZwaXODRXT6SzzaWRro3BDhrCAUqHb6DLxDE9bPNcTTAqtXNosYvZhZT48B
DGEgwA8GTTgsJiND9TjRN0gChoBx4VOV20Ilq294rBdK6y4krS1YHZMs6duBXiv+LuSKcKEgJkW0
Wg==


--===============8577694500676685293==--