bk commit into 5.1 tree (jonas:1.2266)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-05 14:56:39+02:00, jonas@stripped +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
  into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
  MERGE: 1.2256.1.50

  mysql-test/t/disabled.def@stripped, 2006-09-05 14:56:36+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.186.1.9

  sql/ha_ndbcluster.cc@stripped, 2006-09-05 14:56:36+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.346.1.10

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2006-09-05 14:56:36+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.76.1.6

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-jonas/RESYNC

--- 1.189/mysql-test/t/disabled.def	2006-09-05 14:56:44 +02:00
+++ 1.190/mysql-test/t/disabled.def	2006-09-05 14:56:44 +02:00
@@ -13,14 +13,12 @@
 #events_stress            : BUG#17619 2006-02-21 andrey  Race conditions
 #events                   : BUG#17619 2006-02-21 andrey  Race conditions
 #events_scheduling        : BUG#19170 2006-04-26 andrey  Test case of 19170 fails on some platforms. Has to be checked.
-#im_instance_conf          : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly
-im_options                : Bug#20294 2006-07-24 stewart   Instance manager test im_instance_conf fails randomly
+im_options                : Bug#20294 2006-07-24 stewart   Instance manager test im_options fails randomly
 #im_life_cycle             : Bug#20368 2006-06-10 alik    im_life_cycle test fails
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 #ndb_binlog_ignore_db     : BUG#21279 2006-07-25 ingo    Randomly throws a warning
 ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed
-partition                : BUG#21658 2006-08-16 Partition test fails, --ps-protocol
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
 ps                       : BUG#21524 2006-08-08 pgalbraith 'ps' test fails in --ps-protocol test AMD64 bit
 ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open
@@ -44,5 +42,7 @@
 #rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson
 crash_commit_before      : 2006-08-02 msvensson
 rpl_ndb_dd_advance       : BUG#18679 2006-07-28 jimw (Test fails randomly)
+func_group               : BUG#21924 2006-08-30 reggie
+func_in                  : BUG#21925 2006-08-30 reggie
 ndb_binlog_discover      : bug#21806 2006-08-24
 ndb_autodiscover3        : bug#21806

--- 1.352/sql/ha_ndbcluster.cc	2006-09-05 14:56:44 +02:00
+++ 1.353/sql/ha_ndbcluster.cc	2006-09-05 14:56:44 +02:00
@@ -6388,6 +6388,7 @@
     ndbcluster_binlog_init_handlerton();
 #endif
     h.flags=            HTON_CAN_RECREATE | HTON_TEMPORARY_NOT_SUPPORTED;
+    h.discover=         ndbcluster_discover;
   }
 
   if (have_ndbcluster != SHOW_OPTION_YES)
@@ -10579,6 +10580,11 @@
   DBUG_RETURN(0);
 }
 
+SHOW_VAR ndb_status_variables_export[]= {
+  {"Ndb",                      (char*) &ndb_status_variables,   SHOW_ARRAY},
+  {NullS, NullS, SHOW_LONG}
+};
+
 struct st_mysql_storage_engine ndbcluster_storage_engine=
 { MYSQL_HANDLERTON_INTERFACE_VERSION, &ndbcluster_hton };
 
@@ -10592,7 +10598,7 @@
   ndbcluster_init, /* Plugin Init */
   NULL, /* Plugin Deinit */
   0x0100 /* 1.0 */,
-  0
+  ndb_status_variables_export
 }
 mysql_declare_plugin_end;