Merge with 4.1

4 files changed, 27 insertions, 12 deletions

diff --git a/scripts/fill_help_tables.sh b/scripts/fill_help_tables.sh
index 78dfe7b6088..fbe7c597b34 100644
--- a/scripts/fill_help_tables.sh
+++ b/scripts/fill_help_tables.sh
@@ -203,7 +203,7 @@ sub prepare_name
   $a =~ s/\@command\{((.|\n)+?)\}/$1/go;
   $a =~ s/\@code\{((.|\n)+?)\}/$1/go;
   $a =~ s/\@strong\{(.+?)\}/$1/go;
-  $a =~ s/\@samp\{(.+?)\}/$1/go;
+  $a =~ s/\@samp\{(.+?)\}/'$1'/go;
   $a =~ s/\@emph\{((.|\n)+?)\}/\/$1\//go;
   $a =~ s/\@xref\{((.|\n)+?)\}/See also : [$1]/go;
   $a =~ s/\@ref\{((.|\n)+?)\}/[$1]/go;
@@ -254,7 +254,7 @@ sub prepare_description
   $a =~ s/\@command\{((.|\n)+?)\}/$1/go;
   $a =~ s/\@code\{((.|\n)+?)\}/$1/go;
   $a =~ s/\@strong\{(.+?)\}/$1/go;
-  $a =~ s/\@samp\{(.+?)\}/$1/go;
+  $a =~ s/\@samp\{(.+?)\}/'$1'/go;
   $a =~ s/\@emph\{((.|\n)+?)\}/\/$1\//go;
   $a =~ s/\@xref\{((.|\n)+?)\}/See also : [$1]/go;
   $a =~ s/\@ref\{((.|\n)+?)\}/[$1]/go;
@@ -454,10 +454,12 @@ sub print_verbose_errors
   print STDERR "number of help keywords            - ",$count_keywords,"\n";
     
   my $count_without_help= scalar(@without_help);
+  my $percent_without_help= $count_lex ?
+                            int (($count_without_help/$count_lex)*100) :
+                            "100";
   print_bad_names(\@without_help,"lexems without help (".
                             $count_without_help." ~ ".
-                            (int (($count_without_help/$count_lex)*100)).
-                            "%)");
+                            $percent_without_help."%)");
   print_bad_names(\@description_with_at,
           " topics below have symbol \'@\' in their descriptions.\n".
           "it's probably the litter from 'texi' tags (script needs fixing)");
@@ -467,10 +469,12 @@ sub print_verbose_errors
   print_bad_names(\@without_description,"topics without description");
     
   my $count_without_example= scalar(@without_example);
+  my $percent_without_example= $count_topics ?
+                            int (($count_without_example/$count_topics)*100) :
+                            "100";
   print_bad_names(\@without_example,"topics without example (".
                             $count_without_example." ~ ".
-                            (int (($count_without_example/$count_topics)*100)).
-                            "%)");
+                            $percent_without_example."%)");
 }
 
 print_verbose_errors if ($verbose_option ne 0);
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index e68b5bebbd4..eec4ddda27b 100644
--- a/scripts/make_win_src_distribution.sh
+++ b/scripts/make_win_src_distribution.sh
@@ -188,8 +188,11 @@ copy_dir_files()
        print_debug "Creating directory '$arg'"
        mkdir $BASE/$arg
      fi
-    for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def \
-             README INSTALL* LICENSE
+    for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp \
+             README INSTALL* LICENSE *.inc *.test *.result \
+	     *.pem Moscow_leap des_key_file *.dat *.000001 \
+	     *.require *.opt
+
     do
       if [ -f $i ]
       then
@@ -244,10 +247,15 @@ do
 done
 
 #
+# Create project files for ndb
+#
+make -C $SOURCE/ndb windoze
+
+#
 # Input directories to be copied recursively
 #
 
-for i in bdb innobase
+for i in bdb innobase mysql-test ndb
 do
   copy_dir_dirs $i
 done
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh
index 6790ebbffa6..d5c96532782 100644
--- a/scripts/mysql_fix_privilege_tables.sh
+++ b/scripts/mysql_fix_privilege_tables.sh
@@ -15,6 +15,7 @@ socket=""
 database="mysql"
 bindir="."
 pkgdatadir="@pkgdatadir@"
+print_defaults_bindir="."
 
 file=mysql_fix_privilege_tables.sql
 
@@ -58,7 +59,9 @@ parse_arguments() {
       --port=*) port=`echo "$arg" | sed -e "s;--port=;;"` ;;
       --socket=*) socket=`echo "$arg" | sed -e "s;--socket=;;"` ;;
       --database=*) database=`echo "$arg" | sed -e "s;--database=;;"` ;;
-      --bindir=*) bindir=`echo "$arg" | sed -e "s;--bindir=;;"` ;;
+      --bindir=*) bindir=`echo "$arg" | sed -e "s;--bindir=;;"`
+                  print_defaults_bindir=$bindir
+		  ;;
       *)
         if test -n "$pick_args"
         then
@@ -75,7 +78,7 @@ parse_arguments() {
 # [mysql_install_db], and then merge with the command line arguments
 
 print_defaults=my_print_defaults
-for dir in ./bin @bindir@ @bindir@ extra $bindir/../bin $bindir/../extra
+for dir in ./bin @bindir@ @bindir@ extra $print_defaults_bindir/../bin $print_defaults_bindir/../extra
 do
   if test -x $dir/my_print_defaults
   then
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index b4f59790e73..8b2e42bd8cd 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -213,7 +213,7 @@ then
 fi
 mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \
 --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \
---skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M"
+--skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M --net_buffer_length=16K"
 if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \
    | eval "$mysqld_install_cmd_line" 
 then