Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged

mysql-test/mysql-test-run.pl

@@ -1172,6 +1172,8 @@ sub executable_setup () {
 
 sub environment_setup () {
 
+  umask(022);
+
   # --------------------------------------------------------------------------
   # We might not use a standard installation directory, like /usr/lib.
   # Set LD_LIBRARY_PATH to make sure we find our installed libraries.
@@ -3281,7 +3283,7 @@ sub run_mysqltest ($) {
   }
 
   my $cmdline_mysql=
-    "$exe_mysql --host=localhost  --user=root --password= " .
+    "$exe_mysql --no-defaults --host=localhost  --user=root --password= " .
     "--port=$master->[0]->{'path_myport'} " .
     "--socket=$master->[0]->{'path_mysock'}";
 

mysql-test/r/ndb_dd_basic.result

@@ -11,7 +11,7 @@ ADD UNDOFILE 'undofile02.dat'
 INITIAL_SIZE = 4M 
 ENGINE=XYZ;
 Warnings:
-Error	1266	Using storage engine MyISAM for table 'lg1'
+Error	1286	Unknown table engine 'XYZ'
 Error	1465	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
 CREATE TABLESPACE ts1
 ADD DATAFILE 'datafile.dat'

mysql-test/t/partition_mgm_err2.test

@@ -15,7 +15,7 @@ enable_query_log;
 --system mkdir $MYSQLTEST_VARDIR/tmp/bug14354
 disable_query_log;
 eval CREATE TABLE t1 (id int) PARTITION BY RANGE(id) (
-PARTITION p1 VALUES LESS THAN (20) ENGINE=myiasm
+PARTITION p1 VALUES LESS THAN (20) ENGINE=myisam
 DATA DIRECTORY="$MYSQLTEST_VARDIR/tmp/bug14354"
 INDEX DIRECTORY="$MYSQLTEST_VARDIR/tmp/bug14354");
 enable_query_log;