Merge maint2.mysql.com:/data/localhome/tsmith/bk/41

into  maint2.mysql.com:/data/localhome/tsmith/bk/50


mysql-test/r/heap_btree.result:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/t/heap_btree.test:
  Manual merge.

mysql-test/t/heap_btree.test

@@ -204,3 +204,4 @@ CREATE TABLE t1 (a INT, UNIQUE USING BTREE(a)) ENGINE=MEMORY;
 INSERT INTO t1 VALUES(NULL),(NULL);
 DROP TABLE t1;
 
+--echo End of 5.0 tests

sql/set_var.cc

@@ -870,8 +870,8 @@ struct show_var_st init_vars[]= {
   {"have_geometry",           (char*) &have_geometry,               SHOW_HAVE},
   {"have_innodb",	      (char*) &have_innodb,		    SHOW_HAVE},
   {"have_isam",		      (char*) &have_isam,		    SHOW_HAVE},
-  {"have_ndbcluster",         (char*) &have_ndbcluster,             SHOW_HAVE},
   {"have_merge_engine",       (char*) &have_merge_db,               SHOW_HAVE},
+  {"have_ndbcluster",         (char*) &have_ndbcluster,             SHOW_HAVE},
   {"have_openssl",	      (char*) &have_openssl,		    SHOW_HAVE},
   {"have_query_cache",        (char*) &have_query_cache,            SHOW_HAVE},
   {"have_raid",		      (char*) &have_raid,		    SHOW_HAVE},