merge

configure.in:
  Auto merged
mysql-test/t/ndb_blob.test:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged

1 files changed, 26 insertions, 0 deletions

diff --git a/mysql-test/t/ndb_blob.test b/mysql-test/t/ndb_blob.test
index 391d2a2ec23..3671c7fd07a 100644
--- a/mysql-test/t/ndb_blob.test
+++ b/mysql-test/t/ndb_blob.test
@@ -2,6 +2,7 @@
 
 --disable_warnings
 drop table if exists t1;
+drop database if exists test2;
 --enable_warnings
 
 #
@@ -211,6 +212,31 @@ select * from t1 order by a;
 alter table t1 drop x;
 select * from t1 order by a;
 
+# multi db
+
+create database test2;
+use test2;
+
+CREATE TABLE t2 (
+  a bigint unsigned NOT NULL PRIMARY KEY,
+  b int unsigned not null,
+  c int unsigned
+) engine=ndbcluster;
+
+insert into t2 values (1,1,1),(2,2,2);
+select * from test.t1,t2 where test.t1.a = t2.a order by test.t1.a;
+
+drop table t2;
+use test;
+
+# alter table
+
+select * from t1 order by a;
+alter table t1 add x int;
+select * from t1 order by a;
+alter table t1 drop x;
+select * from t1 order by a;
+
 # range scan delete
 delete from t1 where c >= 100;
 commit;