bzr push into mysql-trunk-cluster branch (jonas.oreland:3390 to 3391)

[Jonas Oreland]

 3391 Jonas Oreland	2011-10-06
      ndb - use default_storage_engine instead of storage_engine

    modified:
      mysql-test/suite/ndb/r/ndb_temporary.result
      mysql-test/suite/ndb/t/ndb_temporary.test
 3390 magnus.blaudd@stripped	2011-10-05 [merge]
      Merge 5.5-cluster -> trunk-cluster

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_temporary.result'
--- a/mysql-test/suite/ndb/r/ndb_temporary.result	2011-09-30 08:27:11 +0000
+++ b/mysql-test/suite/ndb/r/ndb_temporary.result	2011-10-06 07:34:44 +0000
@@ -9,7 +9,7 @@ CREATE TABLE bar ( id TINYINT NOT NULL A
 CREATE TEMPORARY TABLE foo LIKE bar ;
 ERROR HY000: Cannot create temporary table with partitions
 DROP TABLE bar;
-SET SESSION storage_engine=NDBCLUSTER;
+SET SESSION default_storage_engine=NDBCLUSTER;
 create table t1 (a int key);
 select engine from information_schema.tables where table_name = 't1';
 engine

=== modified file 'mysql-test/suite/ndb/t/ndb_temporary.test'
--- a/mysql-test/suite/ndb/t/ndb_temporary.test	2011-09-30 08:27:11 +0000
+++ b/mysql-test/suite/ndb/t/ndb_temporary.test	2011-10-06 07:34:44 +0000
@@ -32,7 +32,7 @@ DROP TABLE bar;
 # if default storage engine=ndb, temporary tables
 # without explicit engine= should be created as myisam
 #
-SET SESSION storage_engine=NDBCLUSTER;
+SET SESSION default_storage_engine=NDBCLUSTER;
 create table t1 (a int key);
 
 # verify that we have a ndb table

No bundle (reason: useless for push emails).