bk commit into 5.0 tree (joerg:1.2283)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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, 2006-11-09 17:44:53+01:00, joerg@trift2. +1 -0
  Merge trift2.:/MySQL/M41/bug17194-4.1
  into  trift2.:/MySQL/M50/bug17194-5.0
  MERGE: 1.1616.2773.3

  mysql-test/install_test_db.sh@stripped, 2006-11-09 17:44:48+01:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.24.1.10

# 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:	joerg
# Host:	trift2.
# Root:	/MySQL/M50/bug17194-5.0/RESYNC

--- 1.35/mysql-test/install_test_db.sh	2006-11-09 17:45:00 +01:00
+++ 1.36/mysql-test/install_test_db.sh	2006-11-09 17:45:00 +01:00
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 1997-2002 MySQL AB
+# Copyright (C) 1997-2006 MySQL AB
 # For a more info consult the file COPYRIGHT distributed with this file
 
 # This scripts creates the privilege tables db, host, user, tables_priv,
@@ -7,19 +7,26 @@
 
 if [ x$1 = x"--bin" ]; then
   shift 1
+  BINARY_DIST=1
+
+  bindir=../bin
+  scriptdir=../bin
+  libexecdir=../libexec
 
   # Check if it's a binary distribution or a 'make install'
   if test -x ../libexec/mysqld
   then
     execdir=../libexec
+  elif test -x ../../sbin/mysqld  # RPM installation
+  then
+    execdir=../../sbin
+    bindir=../../bin
+    scriptdir=../../bin
+    libexecdir=../../libexec
   else
     execdir=../bin
   fi
-  bindir=../bin
-  BINARY_DIST=1
   fix_bin=mysql-test
-  scriptdir=../bin
-  libexecdir=../libexec
 else
   execdir=../sql
   bindir=../client