From 6678ecf19a0daf521af92a7d175b1525f9a51ab5 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Fri, 30 Apr 2004 14:02:17 +0300
Subject: Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug
 #1647) Added checking of cut read lines in bootstrap thread (Bug #2874)

---
 scripts/mysql_install_db.sh | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'scripts/mysql_install_db.sh')

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 1861e8c52f8..61d173aac05 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -200,15 +200,28 @@ if test "$in_rpm" -eq 0 -a "$windows" -eq 0
 then
   echo "Installing all prepared tables"
 fi
-if (
-   $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows 
-   if test -n "$fill_help_tables"
-   then
-     cat $fill_help_tables
-   fi
-) | eval "$mysqld $defaults $mysqld_opt --bootstrap --skip-grant-tables \
-         --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb $args" 
+mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \
+--skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \
+--skip-bdb $args"
+if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \
+   | eval "$mysqld_install_cmd_line" 
 then
+  if test -n "$fill_help_tables"
+  then
+    if test "$in_rpm" -eq 0 -a "$windows" -eq 0
+    then
+      echo "Fill help tables"
+    fi
+    if ! (echo "use mysql;
+          " 
+          cat $fill_help_tables) | eval "$mysqld_install_cmd_line"
+    then
+      echo ""
+      echo "WARNING: HELP FILES ARE NOT COMPLETELY INSTALLED!"
+      echo "The \"HELP\" command might not work properly"
+      echo ""
+    fi
+  fi
   if test "$in_rpm" = 0 -a "$windows" = 0
   then
     echo ""
@@ -250,7 +263,7 @@ then
   fi
   exit 0
 else
-  echo "Installation of grant tables failed!"
+  echo "Installation of system tables failed!"
   echo
   echo "Examine the logs in $ldata for more information."
   echo "You can also try to start the mysqld daemon with:"
-- 
cgit v1.2.1