From: magnus.blaudd
Date: June 8 2011 7:25pm
Subject: bzr commit into mysql-trunk-cluster branch (magnus.blaudd:3320)
List-Archive: http://lists.mysql.com/commits/138882
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1327943486935596872=="

--===============1327943486935596872==
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

 3320 magnus.blaudd@stripped	2011-06-08
      ndb
       - udate .result file for new error meesage of 'Unknown table' which now also
       includes databse name

    modified:
      mysql-test/suite/ndb/r/ndb_single_user.result
=== modified file 'mysql-test/suite/ndb/r/ndb_single_user.result'
--- a/mysql-test/suite/ndb/r/ndb_single_user.result	2011-01-21 14:27:30 +0000
+++ b/mysql-test/suite/ndb/r/ndb_single_user.result	2011-06-08 19:24:13 +0000
@@ -86,7 +86,7 @@ insert into t1 select * from t2;
 create unique index new_index on t1 (b,c);
 drop table t2;
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 create index new_index_fail on t1 (c);
 ERROR HY000: Got error 299 'Operation not allowed or aborted due to single user mode' from NDBCLUSTER
 insert into t1 values (21,21,0),(22,22,0),(23,23,0),(24,24,0),(25,25,0),(26,26,0),(27,27,0),(28,28,0),(29,29,0),(210,210,0);


--===============1327943486935596872==
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\
#   fkwy49gwvfubmw6o
# target_branch: file:///data0/magnus/mysql/trunk-cluster/
# testament_sha1: 0594e10ba90e919c75e243c073ca49482dc040fd
# timestamp: 2011-06-08 21:25:27 +0200
# source_branch: file:///data0/magnus/mysql/5.5-cluster/
# base_revision_id: magnus.blaudd@stripped\
#   jedwq9kw11cnurst
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfwYqXAAAWtfgAAQUOP/91IA
mgC////wUAOaV7dp2veb3j1e9wkkTSnlT9lGp6Kb0j00yk/aqbQR5BoQJRKbRpiGqeT1R4pvUhoA
AAAlE0j1TIxPUTYk9Jo2pkGTTQADJEGhHqekyBkyDJoAAAJKJphJkZMp6mymm1DT0IAaAWWk3PuU
qlubOW1wMoG92a6qLXcHeMJb61FXn5p8RyWM7CbOobh8/DVSOX3/OvpC53N7nq4Y7+E8pfV2UPFO
ZG6Wizb6OgjswAu1Zq/Mv7d2wrwSLUig1tY6NUNkoCuph1IIx02k404ohjYNj3oEByZJ0dIu1I6w
VLOD++Gt6DoXz67BDSohooFtNbFoo92alyG+Y46816YtFAlTAg5StYXPzHsENexOjrFop9MVOQxv
hQDoacLWx/hwKCMnIxI1JMlhrzQH5DpwKr3NrpESjbkqlS6sKLTQW84CVD3mJC5qwry2xYaE94Ps
mVGZCETI2tHINMW6pDGFpVU9DBx2CzOqtW6C+YuzhjVJLHDTUt0bKSR1a4zKMHxegRtMEg2OXFJ5
MgXuEibCcIFd1Yn6kBjktjyXK1UFvYSs2ItitHB1VNr8yeNfG57F/NyQ/qZMe7nf34ajV28rJVix
y0oemHLzHBx2lZSTQTvLNIfLhfUThOb0jPXYUvloRAqG0SJvlbqW+gN+XmkRPIUTi/yyCM/ExcO4
xJR/GbKikQkK4zGUkOnW6naIo4y+UeWcRIqGD4K3MIQoUrsIdCnHOmG3uU0VQQRWkKbp3lFYO4Rg
mPHZ+pffdkXfVyv02YrGaBOWoqakwy6lbDrmya6XFoArZGrkPtNuWE/0aMaQOBadnT84NMW1y07j
/VCfzwLgKlJyQ8oI7adIu8IQwTcXGlOCyv/kWznMQYTPcI4J+Z2OcFwcm72cdKvsY+wJjYrBdASC
TQ7AXWMoSGmK6q6msOcoGYiGFwfBzGNNqyKTbKfUbJp3HLWKRhGgiFBJyJYQKoQeDrf4duOGGCIs
V6vSJlZjcIUNAeVIwAwgbHyzp+JFoCzcoz6zwFbi2hEKxBrNxRsf1qXgZDZGWWIpgCdrkewS76ye
MVcW3Or6YZSjIEKlkiwPLcjny3UgkApAYpDFNbZalWFoEpbUDGZSF1I8rotxI3EYKpKOhmX3ocV7
bMw4ZQg/c9WF9JoQFfGxIjTupcWNYJbFTlMoV+Iq7wz2tzUwtNbScsXaJ4sIrC1Ui336K8zlsxKy
nV/i7kinChIfgxUuAA==


--===============1327943486935596872==--