From: Martin Skold
Date: June 29 2011 1:08pm
Subject: bzr commit into mysql-5.5-cluster branch (Martin.Skold:3391)
List-Archive: http://lists.mysql.com/commits/140019
Message-Id: <20110629130806.EDECA9F8D75@quadfish>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0209411766=="

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

#At file:///home/marty/MySQL/mysql-5.5-cluster/ based on revid:martin.skold@stripped

 3391 Martin Skold	2011-06-29
      Enabled ndb_index_ordered since it apparently doesn't fail anymore

    modified:
      mysql-test/suite/ndb/t/disabled.def
=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def	2011-06-22 11:29:27 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def	2011-06-29 13:07:53 +0000
@@ -18,9 +18,6 @@ ndb_disconnect_ddl        : Bug#31853 fl
 
 ndb_condition_pushdown	 : SEAGULL
 
-ndb_index_ordered	 : SEAGULL alter in second connection deadlocks
-
-
 ndb_multi		 : SEAGULL schema distribution 
 
 ndb_sql_allow_batching   : SEAGULL WL3733 xxx_allow_batching


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.skold@stripped
# target_branch: file:///home/marty/MySQL/mysql-5.5-cluster/
# testament_sha1: 93740ae97016e76f21974a829efece1f198be60e
# timestamp: 2011-06-29 15:08:06 +0200
# base_revision_id: martin.skold@stripped\
#   i3rhverwf8j836yf
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZnmGDUAAV/fgAAQUOP/91IC
CAC////wUANnd54b3esjtNvDJCGhoibTNEyaaamanqPRPUDIJSmJG0p/omU9E9TKMTQAAACSITKZ
Tammn6pkZqeppoyAaNAwyJQep4k09Q9TJoaAAAACUVMwjJMJtSabJpNqaaZAGho6oaYairZtFU9U
ogQiWlVS1KbsdEiIO2Y+mQpGiklCdYu0XhM+64VzK+1FSB0+naZ+HQqQjbdY0agihYcDZAKy2Qj2
lRG45uIkNKgidG2Iwv2gUpVSFQkIA87C+UZA8DmFlaCiowxeHRxtR2Xb9Q0xGkr23CJ8Is4JcPc7
RLIRokMIB6H3HhzogOkOtUrvGpzLlEH3NwaVv26mDjD6JkB9ihmQaTCZGwogKxEsaBSKlUarpDuB
ik0fcmlhfSM0YxxI1chKYifJTOt88zCQkucIjC3baMkqGW5kDbN8MAUE4b9mqs8KDqOTPYyJl13J
GhiwsKP0cI4iQ0gj4FpEVzS/W044I9qqj3a13ELajUrcIPkX1yyFOYjQzOKrCx8GTk6LStRkgNNk
02kUCdGrvOumk8aqvtjBIlRkxwfEd3cpZobkI8dPWAwPuYBypCTyUiweZ5jlkSL24CBgEvk+6eQ6
kT7MEE4yPMSmu/wNWQ4ZaVBr6GfgC4njp+QC0uRCRHQSIVg78xzoZ69znzSulLZYyiyXkhgkXtjY
kMnZ5HKRnvOFmNvRQS6oWeXvIN5GN7zjog8F2XTwTocOMbOcqKtMll8WKXaqGgjPgoZKaFJJfCbb
a4UjAasrlNA9KhmGXYjyX08njgNRaE3jTKLhxUPYcXEUbhFUKRGby3BIm04pjsYVz9kVrTYJXJJy
5QSz5Cir913TND2QqRcwh7Z6Xa+I/JJy3aRtDvnOzRBaS/DriDQZoDkCMiiCnAHm1p3ShTRVAQsM
dHeHU+Bn2LA54ZzXTwlJW2HVY6Qy+8bo0YIansalDQKCFDM2/q8Oz38AC8AyAZQjySLANz5jiw72
UGl6QqUSW4jXps+chG8WlZElsapB2kKmy89VLPNVzwzbhWXApumWhGYo6eL5dYmMLr5A/mcRFqwt
vNu1tp8DEwrCK6tPatj2TdS8V1k3LUK7XuqFBMfgjQCgxDLUzHmFO6A/DTuNQGIyrBTlsP4I11tk
Qtc0xmDIVonJ6/4u5IpwoSEzzDBq


--===============0209411766==--