Merged 4.1 -> 5.0

include/mysql_com.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

scripts/make_win_src_distribution.sh

@@ -178,18 +178,8 @@ rm -r -f "$BASE/share/Makefile"
 rm -r -f "$BASE/share/Makefile.in"
 rm -r -f "$BASE/share/Makefile.am"
 
-#
-# Clean up if we did this from a bk tree
-#
-
-if [ -d $BASE/SCCS ]
-then
-  find $BASE/ -type d -name SCCS -printf " \"%p\"" | xargs rm -r -f
-fi
-
 mkdir $BASE/Docs $BASE/extra $BASE/include
 
-
 #
 # Copy directory files
 #
@@ -320,6 +310,15 @@ done
 unix_to_dos $BASE/README
 mv $BASE/README $BASE/README.txt
 
+#
+# Clean up if we did this from a bk tree
+#
+
+if [ -d $BASE/SSL/SCCS ]
+then
+  find $BASE -type d -name SCCS | xargs rm -r -f
+fi
+
 #
 # Initialize the initial data directory
 #

scripts/mysql_install_db.sh

@@ -119,11 +119,13 @@ fi
 mdata=$ldata/mysql
 mysqld=$execdir/mysqld
 mysqld_opt=""
+scriptdir=$bindir
 
 if test "$windows" = 1
 then
   mysqld="./sql/mysqld"
   mysqld_opt="--language=./sql/share/english"
+  scriptdir="./scripts"
 fi
 
 if test ! -x $mysqld
@@ -199,7 +201,7 @@ then
   echo "Installing all prepared tables"
 fi
 if (
-   $bindir/mysql_create_system_tables $create_option $mdata $hostname $windows 
+   $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows 
    if test -n "$fill_help_tables"
    then
      cat $fill_help_tables