Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1

2 files changed, 7 insertions, 7 deletions

diff --git a/mysql-test/ndb/install_ndbcluster b/mysql-test/ndb/install_ndbcluster
index dab94db759e..6cb3985b831 100755
--- a/mysql-test/ndb/install_ndbcluster
+++ b/mysql-test/ndb/install_ndbcluster
@@ -64,12 +64,12 @@ start_default_ndbcluster() {
 NDB_CONNECTSTRING=
 
 if [ $initial_ndb ] ; then
-  mkdir $fs_ndb
-  mkdir $fs_mgm_1
-  mkdir $fs_ndb_2
-  mkdir $fs_ndb_3
-  mkdir $fs_name_2
-  mkdir $fs_name_3
+  [ -d $fs_ndb ] || mkdir $fs_ndb
+  [ -d $fs_mgm_1 ] || mkdir $fs_mgm_1
+  [ -d $fs_ndb_2 ] || mkdir $fs_ndb_2
+  [ -d $fs_ndb_3 ] || mkdir $fs_ndb_3
+  [ -d $fs_name_2 ] || mkdir $fs_name_2
+  [ -d $fs_name_3 ] || mkdir $fs_name_3
 fi
 if [ -d "$fs_ndb" -a -d "$fs_mgm_1" -a -d "$fs_ndb_2" -a -d "$fs_ndb_3" -a -d "$fs_name_2" -a -d "$fs_name_3" ]; then :; else
   echo "$fs_ndb filesystem directory does not exist"
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index bd540e4ebc4..3ae5914b439 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5136,7 +5136,7 @@ static void mysql_init_variables(void)
   have_example_db= SHOW_OPTION_NO;
 #endif
 #ifdef HAVE_NDBCLUSTER_DB
-  have_ndbcluster=SHOW_OPTION_YES;
+  have_ndbcluster=SHOW_OPTION_DISABLED;
 #else
   have_ndbcluster=SHOW_OPTION_NO;
 #endif