diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a76361693a..3a286071bb0 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,9 +80,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-small.cnf.sh
 IF(__NT__)
   ADD_DEFINITIONS(-D __NT__)
 ENDIF(__NT__)
-IF(CYBOZU)
-  ADD_DEFINITIONS(-D CYBOZU)
-ENDIF(CYBOZU)
 
 # in some places we use DBUG_OFF
 SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")
diff --git a/Makefile.am b/Makefile.am
index 3a1bfc0e32a..ed54b630aea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -147,6 +147,16 @@ test-force-full:
 test-force-mem:
 	$(MAKE) force=--force mem=--mem test
 
+test-bt:
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	@PERL@ ./mysql-test-run.pl --force --comment=normal --report-features
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	@PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol
+
+test-bt-debug:
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	@PERL@ ./mysql-test-run.pl --force --comment=debug --report-features
+
 # Keep these for a while
 test-pl:	test
 test-full-pl:	test-full
diff --git a/configure.in b/configure.in
index 7867bf444ad..9b0505a594f 100644
--- a/configure.in
+++ b/configure.in
@@ -2376,12 +2376,18 @@ AC_ARG_WITH(man,
     [with_man=yes]
 )
 
-if test "$with_man" = "yes"
+if test X"$with_man" = Xyes
 then
   man_dirs="man"
-  man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`
+  if test X"$have_ndbcluster" = Xyes
+  then
+    man1_files=`ls $srcdir/man/*.1 | sed -e 's;^.*man/;;'`
+    man8_files=`ls $srcdir/man/*.8 | sed -e 's;^.*man/;;'`
+  else
+    man1_files=`ls $srcdir/man/*.1 | grep -v '/ndb' | sed -e 's;^.*man/;;'`
+    man8_files=`ls $srcdir/man/*.8 | grep -v '/ndb' | sed -e 's;^.*man/;;'`
+  fi
   man1_files=`echo $man1_files`
-  man8_files=`ls -1 $srcdir/man/*.8 | sed -e 's;^.*man/;;'`
   man8_files=`echo $man8_files`
 else
   man_dirs=""
diff --git a/include/config-win.h b/include/config-win.h
index 34e828e01e8..279be7aa5e4 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -408,14 +408,8 @@ inline double ulonglong2double(ulonglong value)
 #define shared_memory_buffer_length 16000
 #define default_shared_memory_base_name "MYSQL"
 
-#ifdef CYBOZU
-#define MYSQL_DEFAULT_CHARSET_NAME "utf8"
-#define MYSQL_DEFAULT_COLLATION_NAME "utf8_general_cs"
-#define HAVE_UTF8_GENERAL_CS 1
-#else
 #define MYSQL_DEFAULT_CHARSET_NAME "latin1"
 #define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"
-#endif
 
 #define HAVE_SPATIAL 1
 #define HAVE_RTREE_KEYS 1
@@ -426,10 +420,8 @@ inline double ulonglong2double(ulonglong value)
 /* Define charsets you want */
 /* #undef HAVE_CHARSET_armscii8 */
 /* #undef HAVE_CHARSET_ascii */
-#ifndef CYBOZU
 #define HAVE_CHARSET_big5 1
 #define HAVE_CHARSET_cp1250 1
-#endif
 /* #undef HAVE_CHARSET_cp1251 */
 /* #undef HAVE_CHARSET_cp1256 */
 /* #undef HAVE_CHARSET_cp1257 */
@@ -438,33 +430,27 @@ inline double ulonglong2double(ulonglong value)
 /* #undef HAVE_CHARSET_cp866 */
 #define HAVE_CHARSET_cp932 1
 /* #undef HAVE_CHARSET_dec8 */
-#ifndef CYBOZU
 #define HAVE_CHARSET_eucjpms 1
 #define HAVE_CHARSET_euckr 1
 #define HAVE_CHARSET_gb2312 1
 #define HAVE_CHARSET_gbk 1
-#endif
 /* #undef HAVE_CHARSET_greek */
 /* #undef HAVE_CHARSET_hebrew */
 /* #undef HAVE_CHARSET_hp8 */
 /* #undef HAVE_CHARSET_keybcs2 */
 /* #undef HAVE_CHARSET_koi8r */
 /* #undef HAVE_CHARSET_koi8u */
-#ifndef CYBOZU
 #define HAVE_CHARSET_latin1 1
 #define HAVE_CHARSET_latin2 1
-#endif
 /* #undef HAVE_CHARSET_latin5 */
 /* #undef HAVE_CHARSET_latin7 */
 /* #undef HAVE_CHARSET_macce */
 /* #undef HAVE_CHARSET_macroman */
 #define HAVE_CHARSET_sjis 1
 /* #undef HAVE_CHARSET_swe7 */
-#ifndef CYBOZU
 #define HAVE_CHARSET_tis620 1
 #define HAVE_CHARSET_ucs2 1
 #define HAVE_CHARSET_ujis 1
-#endif
 #define HAVE_CHARSET_utf8 1
 #define HAVE_UCA_COLLATIONS 1
 
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index ce1335e1bc4..8cb425edcec 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -354,12 +354,7 @@ then
   cp -fp config.log "$MYSQL_MAXCONFLOG_DEST"
 fi
 
-( cd mysql-test
-  MTR_BUILD_THREAD=auto
-  export MTR_BUILD_THREAD
-  perl ./mysql-test-run.pl --force --report-features
-  perl ./mysql-test-run.pl --force --ps-protocol
-  true )
+make test-bt
 
 # Save mysqld-max
 ./libtool --mode=execute cp sql/mysqld sql/mysqld-max
@@ -418,12 +413,7 @@ then
   cp -fp config.log "$MYSQL_CONFLOG_DEST"
 fi
 
-( cd mysql-test
-  MTR_BUILD_THREAD=auto
-  export MTR_BUILD_THREAD
-  perl ./mysql-test-run.pl --force --report-features
-  perl ./mysql-test-run.pl --force --ps-protocol
-  true )
+make test-bt
 
 %install
 RBR=$RPM_BUILD_ROOT
diff --git a/win/README b/win/README
index 8fe3dc21d1e..871ae4efee7 100644
--- a/win/README
+++ b/win/README
@@ -48,7 +48,6 @@ The options right now are
     MYSQL_SERVER_SUFFIX=<suffix>         Server suffix, default none
     COMPILATION_COMMENT=<comment>        Server comment, default "Source distribution"
     MYSQL_TCP_PORT=<port>                Server port, default 3306
-    CYBOZU
     DISABLE_GRANT_OPTIONS                Disables the use of --init-file and --skip-grant-tables
                                          options of mysqld.exe
                                 
diff --git a/win/configure.js b/win/configure.js
index 59c73fc2fab..3488efacba3 100755
--- a/win/configure.js
+++ b/win/configure.js
@@ -46,7 +46,6 @@ try
             case "WITH_INNOBASE_STORAGE_ENGINE":
             case "WITH_PARTITION_STORAGE_ENGINE":
             case "__NT__":
-            case "CYBOZU":
             case "DISABLE_GRANT_OPTIONS":
                     configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
                     break;