From: magnus.blaudd
Date: June 23 2011 1:16pm
Subject: bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3370)
List-Archive: http://lists.mysql.com/commits/139746
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3944667327555050049=="

--===============3944667327555050049==
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/ based on revid:magnus.blaudd@stripped

 3370 magnus.blaudd@stripped	2011-06-23
      ndb
       - mark test as requiring online alter

    modified:
      mysql-test/suite/ndb/t/ndb_alter_table_online_multi.test
=== modified file 'mysql-test/suite/ndb/t/ndb_alter_table_online_multi.test'
--- a/mysql-test/suite/ndb/t/ndb_alter_table_online_multi.test	2011-06-17 10:15:34 +0000
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online_multi.test	2011-06-23 13:16:06 +0000
@@ -1,4 +1,5 @@
 -- source include/not_embedded.inc
+-- source include/ndb_have_online_alter.inc
 -- source include/have_multi_ndb.inc
 
 --echo *******************************


--===============3944667327555050049==
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\
#   w516b9fh90x23ixw
# target_branch: file:///data0/magnus/mysql/5.5-cluster/
# testament_sha1: b19e41f88c24dcd1f807bd36670b8ddb51808feb
# timestamp: 2011-06-23 15:16:50 +0200
# source_branch: file:///data0/magnus/mysql/7.0/
# base_revision_id: magnus.blaudd@stripped\
#   171ob6dve67huaxo
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXI5Zq0AAXLfgAAQUGP/91IA
AAC////wUANae1cmd0N1OhJJCTybRMk8GpqaY9SbSNAaAklMqZsTSY0oejTKA0AAYSSmASYmmm1U
eTNUHqbSNMTQxgAGjTQBk0BoMgNASRSegIaYKbU2RlDTRoaGnqT16N+d3uY67PWuN14Hpo6z21uk
+7PLeMvPunezEk3Mz9Jm9v3STOr1ud9sSzuLq6Z64P5pzI32s+/JFx8iI4GOwq3e8LkttGIiCRCm
va6ia9s5hZNahOOxwOFnNhQBWLfl8wJ1BRphiUue+gWG1OyHy6VSAuxjYX7gX3fB0HWpqLEgoHmc
PatZi2FW3BQJ8ut0zjossIFlZatl05FtBXqCpKI1ELh/C7j1G4JljieEf6WeRJTYTCzO5kuqeb74
PaBmSKxp1NJOA2i6ywVxss1esmz0e6DG3YTkT5ax7hPhPtCGOOLjs4ZKImwkJyuZBFqZFE4nbO0G
IpVTTeGffhZOsMGOGHru8Mts7lOyGmYEmroXWnKl8aFoLuJz0QfPfMwxqUsLpO8qNpTJoMDfLFxW
Tk02iUCdG8i3KfLiObb0dIikYZm/HKwkeZhHW+JQ5qouMIwvsG2vKaTqTrQkbL+RTqDmIzz7hbrj
y1olJGWYi09153V1jFVqiKZEC7QRYtJ94RoaXwNUXc/RjHb5vzoZkh3bYkWYnK/V0R5dKhJUgqnr
f0iMHivSL/bQryktsd7AqZnHb2k/lz44R6Dn69YOmkJ2jiV8iGULG4P27M2h4uNRYmC0va9g8oQo
lTcCcJFI+/phHHMpHC75dMWIjvfJLkwh9ImvDr4T51miqXIwWe+Br3PTatRxLFIXNo74B6qf3y8Z
bg6xBuO8Uutx67N1TdcAzotgDgocMxHTjOkNuG1LFHK2Do0nilJhHLeux9jOdG1V8nZHJz3mtYwZ
v2xSj5sidbxqvU2KlyNEOZbxDrDLH2PJU81jcCmDrSWsSGiRmGxfDqvPg1PmzJw+Pg+NjmyUUl9Y
ueikvpcPyzjRZ4wwlGINeIjhDdzYpeDeMl3x296o3VCjYYHZ/29YP6EYprt/YuZP3XuqGIUztG0r
CYOZStRjARHxroceLrZCNvjVVeqBqdtUcxet38Kwc8U6BRcBc+Kzg8hX4F3JFOFCQcjlmrQ=


--===============3944667327555050049==--