bk commit into 5.1 tree (serg:1.2498)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-30 07:45:56-07:00, serg@stripped +2 -0
  mysql-test/mysql-test-run.pl: another mysqld --help fix
  scripts/mysql_install_db.sh: don't fail if --skip-XXX is not recognized

  mysql-test/mysql-test-run.pl@stripped, 2007-04-30 07:45:48-07:00, serg@stripped +2 -3
    another mysqld --help fix

  scripts/mysql_install_db.sh@stripped, 2007-04-30 07:45:48-07:00, serg@stripped +2 -2
    don't fail if --skip-XXX is not recognized

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	sergbook.mysql.com
# Root:	/usr/home/serg/Abk/mysql-5.1-wl2936

--- 1.76/scripts/mysql_install_db.sh	2007-04-30 07:46:19 -07:00
+++ 1.77/scripts/mysql_install_db.sh	2007-04-30 07:46:19 -07:00
@@ -270,8 +270,8 @@
 # Peform the install of system tables
 mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}"
 mysqld_install_cmd_line="$mysqld_bootstrap $defaults $mysqld_opt --bootstrap \
---basedir=$basedir --datadir=$ldata --skip-innodb \
---skip-ndbcluster $args --max_allowed_packet=8M \
+--basedir=$basedir --datadir=$ldata --loose-skip-innodb \
+--loose-skip-ndbcluster $args --max_allowed_packet=8M \
 --net_buffer_length=16K"
 
 # Pipe mysql_system_tables.sql to "mysqld --bootstrap"

--- 1.299/mysql-test/mysql-test-run.pl	2007-04-30 07:46:19 -07:00
+++ 1.300/mysql-test/mysql-test-run.pl	2007-04-30 07:46:19 -07:00
@@ -1361,10 +1361,9 @@
   # --no-defaults and --skip-grant-tables are to avoid loading
   # system-wide configs and plugins
   #
-  # --datadir - for lowercase test to work
+  # --datadir must exist, mysqld will chdir into it
   #
-  my $tmp_datadir=$opt_vardir || $default_vardir;
-  my $list= `$exe_mysqld --no-defaults --datadir=$tmp_datadir --language=$path_language --skip-grant-tables --verbose --help`;
+  my $list= `$exe_mysqld --no-defaults --datadir=$path_language --language=$path_language --skip-grant-tables --verbose --help`;
 
   foreach my $line (split('\n', $list))
   {