bk commit into 5.1 tree (gni:1.2660) BUG#31853

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of gni.  When gni 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, 2008-03-12 16:27:31+08:00, gni@stripped +1 -0
  BUG#31853 Wrong error message on failed cluster create table after after mysqld (re)start

  sql/ha_ndbcluster.cc@stripped, 2008-03-12 16:27:28+08:00, gni@stripped +2 -0
    the default number of ndbd nodes for partition should be 1 instead of 0, 
    or the partition will give the wrong error message 
    when mysqld never successfully connects to ndb_mgmd ndbd.

diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2008-01-23 21:52:19 +08:00
+++ b/sql/ha_ndbcluster.cc	2008-03-12 16:27:28 +08:00
@@ -9597,6 +9597,8 @@ int ha_ndbcluster::get_default_no_partit
   uint no_fragments=
     get_no_fragments(max_rows >= min_rows ? max_rows : min_rows);
   uint no_nodes= g_ndb_cluster_connection->no_db_nodes();
+  if (unlikely(!no_nodes))
+    no_nodes= 1;
   if (adjusted_frag_count(no_fragments, no_nodes, reported_frags))
   {
     push_warning(current_thd,