Merge bk-internal:/home/bk/mysql-5.1-target-5.1.22

into  magare.gmz:/home/kgeorge/mysql/work/mysql-5.1-target-5.1.22-joro

configure.in

@@ -2623,6 +2623,14 @@ AC_SUBST(CC)
 AC_SUBST(GXX)
 
 # Set configuration options for make_binary_distribution
+case $SYSTEM_TYPE in
+  *netware*)
+    MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --no-strip"
+    ;;
+  *)
+    : # no change for other platforms yet
+    ;;
+esac
 AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
 
 # Output results

mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt

---default-storage-engine=ndbcluster
+--new --default-storage-engine=ndbcluster

mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test

@@ -7,8 +7,9 @@
 # to be able to use the same code for all these different
 # test and to have control over the tests.
 ##############################################################
--- source include/have_ndb.inc
 -- source include/have_innodb.inc
+-- source include/have_ndb.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 SET storage_engine=innodb;
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test

mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt

---binlog-format=row

mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt

---default-storage-engine=ndbcluster
+--new --default-storage-engine=ndbcluster

mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test

@@ -7,6 +7,8 @@
 # to be able to use the same code for all these different
 # test and to have control over the tests.
 ##############################################################
+-- source include/have_ndb.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 SET storage_engine=myisam;
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test

scripts/make_binary_distribution.sh

@@ -212,7 +212,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
 if [ $BASE_SYSTEM = "netware" ] ; then
   BIN_FILES="$BIN_FILES \
     netware/mysqld_safe$BS netware/mysql_install_db$BS \
-    netware/init_db.sql netware/test_db.sql$BS \
+    netware/init_db.sql netware/test_db.sql \
     netware/mysqlhotcopy$BS netware/libmysql$BS netware/init_secure_db.sql \
     ";
 # For all other platforms: