bk commit into 5.1 tree (acurtis:1.2503)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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-05-04 02:19:00-07:00, acurtis@stripped +7 -0
  WL#2936
    Fix tests when InnoDB is not built-in. Innodb options would cause mysqld to abort
    with an error indicating that the option is unknown.
    Fix tests on Windows where mysql-test-run.pl was unable to probe mysqld for version
    and variables information, caused by output being diverted to a log file instead.

  mysql-test/mysql-test-run.pl@stripped, 2007-05-04 02:18:57-07:00, acurtis@stripped +3 -3
    wl2936
      'loose' prefix is required on command line options which may be ignored if
      the plugin for which the option is intended is not installed/builtin to mysqld.

  mysql-test/t/myisam-blob-master.opt@stripped, 2007-05-04 02:18:57-07:00, acurtis@stripped +1 -1
    wl2936
      'loose' prefix is required on command line options which may be ignored if
      the plugin for which the option is intended is not installed/builtin to mysqld.

  mysql-test/t/rpl_row_basic_11bugs-master.opt@stripped, 2007-05-04 02:18:57-07:00, acurtis@stripped +1 -1
    wl2936
      'loose' prefix is required on command line options which may be ignored if
      the plugin for which the option is intended is not installed/builtin to mysqld.

  mysql-test/t/rpl_row_basic_11bugs-slave.opt@stripped, 2007-05-04 02:18:57-07:00, acurtis@stripped +1 -1
    wl2936
      'loose' prefix is required on command line options which may be ignored if
      the plugin for which the option is intended is not installed/builtin to mysqld.

  mysql-test/t/rpl_stm_000001-slave.opt@stripped, 2007-05-04 02:18:57-07:00, acurtis@stripped +1 -1
    wl2936
      'loose' prefix is required on command line options which may be ignored if
      the plugin for which the option is intended is not installed/builtin to mysqld.

  mysql-test/t/warnings-master.opt@stripped, 2007-05-04 02:18:57-07:00, acurtis@stripped +1 -1
    wl2936
      'loose' prefix is required on command line options which may be ignored if
      the plugin for which the option is intended is not installed/builtin to mysqld.

  sql/mysqld.cc@stripped, 2007-05-04 02:18:57-07:00, acurtis@stripped +2 -1
    wl2936
      do not enable the 'old-fashioned error log' when the user has '--help' specified
      on the command line. We do want the help output sent to the console.
      This fixes help output on Windows because it enables this option by default.

# 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:	acurtis
# Host:	ltamd64.xiphis.org
# Root:	/home/antony/work2/mysql-5.1-engines.fixme

--- 1.642/sql/mysqld.cc	2007-05-04 02:19:10 -07:00
+++ 1.643/sql/mysqld.cc	2007-05-04 02:19:10 -07:00
@@ -3190,7 +3190,8 @@
   /* Setup logs */
 
   /* enable old-fashioned error log */
-  if (opt_error_log)
+  /* except when the user has requested help information */
+  if (opt_error_log && !opt_help)
   {
     if (!log_error_file_ptr[0])
       fn_format(log_error_file, pidfile_name, mysql_data_home, ".err",

--- 1.300/mysql-test/mysql-test-run.pl	2007-05-04 02:19:10 -07:00
+++ 1.301/mysql-test/mysql-test-run.pl	2007-05-04 02:19:10 -07:00
@@ -3784,14 +3784,14 @@
     mtr_add_arg($args, "%s--server-id=%d", $prefix,
 	       $idx > 0 ? $idx + 101 : 1);
 
-    mtr_add_arg($args, "%s--innodb_data_file_path=ibdata1:10M:autoextend",
+    mtr_add_arg($args, "%s--loose-innodb_data_file_path=ibdata1:10M:autoextend",
 		$prefix);
 
     mtr_add_arg($args, "%s--local-infile", $prefix);
 
     if ( $idx > 0 or !$use_innodb)
     {
-      mtr_add_arg($args, "%s--skip-innodb", $prefix);
+      mtr_add_arg($args, "%s--loose-skip-innodb", $prefix);
     }
 
     my $cluster= $clusters->[$mysqld->{'cluster'}];
@@ -3835,7 +3835,7 @@
     mtr_add_arg($args, "%s--report-port=%d", $prefix,
                 $mysqld->{'port'});
     mtr_add_arg($args, "%s--report-user=root", $prefix);
-    mtr_add_arg($args, "%s--skip-innodb", $prefix);
+    mtr_add_arg($args, "%s--loose-skip-innodb", $prefix);
     mtr_add_arg($args, "%s--skip-slave-start", $prefix);
 
     # Directory where slaves find the dumps generated by "load data"

--- 1.3/mysql-test/t/rpl_row_basic_11bugs-master.opt	2007-05-04 02:19:10 -07:00
+++ 1.4/mysql-test/t/rpl_row_basic_11bugs-master.opt	2007-05-04 02:19:10 -07:00
@@ -1,2 +1,2 @@
---binlog_ignore_db=test_ignore --innodb
+--binlog_ignore_db=test_ignore --loose-innodb
 

--- 1.1/mysql-test/t/rpl_row_basic_11bugs-slave.opt	2007-05-04 02:19:10 -07:00
+++ 1.2/mysql-test/t/rpl_row_basic_11bugs-slave.opt	2007-05-04 02:19:10 -07:00
@@ -1 +1 @@
---innodb
+--loose-innodb

--- 1.6/mysql-test/t/warnings-master.opt	2007-05-04 02:19:10 -07:00
+++ 1.7/mysql-test/t/warnings-master.opt	2007-05-04 02:19:10 -07:00
@@ -1 +1 @@
---skip-innodb
+--loose-skip-innodb

--- 1.3/mysql-test/t/myisam-blob-master.opt	2007-05-04 02:19:10 -07:00
+++ 1.4/mysql-test/t/myisam-blob-master.opt	2007-05-04 02:19:10 -07:00
@@ -1 +1 @@
---max-allowed-packet=24M --skip-innodb --key-buffer-size=1M
+--max-allowed-packet=24M --loose-skip-innodb --key-buffer-size=1M

--- 1.3/mysql-test/t/rpl_stm_000001-slave.opt	2007-05-04 02:19:10 -07:00
+++ 1.4/mysql-test/t/rpl_stm_000001-slave.opt	2007-05-04 02:19:10 -07:00
@@ -1 +1 @@
---innodb
+--loose-innodb