From: Mats Kindahl
Date: May 12 2010 7:13am
Subject: bzr push into mysql-trunk-bugfixing branch (mats:3037 to 3038)
 Bug#52737
List-Archive: http://lists.mysql.com/commits/108076
X-Bug: 52737
Message-Id: <20100512071317.C3055469DF0@romeo>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_DX0Pw8+fSSQRGHfP9JeLsA)"

--Boundary_(ID_DX0Pw8+fSSQRGHfP9JeLsA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

 3038 Mats Kindahl	2010-05-11
      Bug #52737: plugin_dir is set to /usr/local/mysql/lib/plugin while starting
                  via mysqld_safe
      
      Plugin dir was set to a hard-coded path instead of relative the base dir.
      
      This patch fixes this by using a path relative the basedir instead of the
      plugin directory indicated by the configuration.

    modified:
      scripts/mysqld_safe.sh
 3037 Alexander Nozdrin	2010-05-11
      Make innodb.innodb_information_schema experimental due to Bug 48883.

    modified:
      mysql-test/collections/default.experimental
=== modified file 'scripts/mysqld_safe.sh'
--- a/scripts/mysqld_safe.sh	2010-04-18 13:32:05 +0000
+++ b/scripts/mysqld_safe.sh	2010-05-11 13:55:52 +0000
@@ -699,7 +699,7 @@ fi
 
 cmd="`mysqld_ld_preload_text`$NOHUP_NICENESS"
 
-plugin_dir="${PLUGIN_DIR:-@pkgplugindir@}${PLUGIN_VARIANT}"
+plugin_dir="${PLUGIN_DIR:-$MY_BASEDIR_VERSION/lib/plugin}${PLUGIN_VARIANT}"
 
 for i in  "$ledir/$MYSQLD" "$defaults" "--basedir=$MY_BASEDIR_VERSION" \
   "--datadir=$DATADIR" "--plugin-dir=$plugin_dir" "$USER_OPTION"


--Boundary_(ID_DX0Pw8+fSSQRGHfP9JeLsA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/mats@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/mats@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mats@stripped
# target_branch: file:///home/bzr/bugs/b52737-trunk-bugfixing/
# testament_sha1: 9aff68ef0989c0369b18a48e9c963fdf3ee93222
# timestamp: 2010-05-12 09:13:17 +0200
# source_branch: file:///home/bzr/mysql-trunk-bugfixing/
# base_revision_id: alik@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdM0dNAAAadfgEBQXWP//3av
3yC////6UARYrwdbjdWdON25hJQSZDBBT9MRoAjSemkAGTZR6g8keoJSFM1PKn6CTzVPUaep5EGg
A0AAAABpoRGpT8ECTbJqn6oYanqDaEDQ9NIehDahxkyZMRiYATJgmQA0YRgCGAShEyGpppPJqn5U
/TRRsp4oyB6gyBoGhoFL5/lUumR3fQffN2QRQUqNubQzhBbFSuitmsSGLbCsV9mUkjdtTe82FbEs
y75UWDtfzMSf6vd+bB3Txh3wMHaAdZNDXfPFSIjEoZRJ3GQNio4X1+6/ThX/N74/ObdgAVuNwjPu
9V79vNld0UxTaEX1NJNkrgieP8PYY8MmM1sQZYhlD/ieOE3VE3ApVKghORVNJNYKcqILAzBA4cRc
clCSJhxBUBlGJiBA4FpGcmOFMi/MwOYRPZdMgUIE8BGTY+NUqNaxE0bzgUH7TMWzKeW3HcJJRqS0
/UyCou0S7SWaESqUUUQhWXTpxnIqXsECoxMTHWUpUlIwQM9OdQGRbBR5plgk8wufWlGM5qIkBUUt
Y7tUq2vvM8VQN8S0R+xOTDhKRMdjVkCwmhZszGbLM/APlsuRxht/BKHmJHikozxSGMw6s6TCithe
WzuGgSusHRRMiBsKX5CWBI0UjBXAYMX7ZhIT3xIKO4kBD1i/pGwhOojVq0TCpS+dtahSlP0Nul0D
S0xrpHb0wXDnmhnYMYz044Gtd/IehZyH8jbzOODn+r66krXTNbI/x5l86f15axo0UgNr4ZzNaKPN
kAbzuOsKadsaui7Aj9uP3ks5PDN5MjE/4+J5J8bCLgVQJXF0efOaU5Dus80hjUQIBVUXfHVE2hWW
F/WdtnUf7GD8zlyCmdKIQL8mBQ0VpadRipIk6MSJ2DKBGi6oLlIcdAq4Pj7Tq4bguqO0e2YpImW4
WvaPJ4rlQPBw4hqLuzUXpJ4HaItNFFIS0urdEPHGU1JIjwMKMvHVqWlrJzEWMM5CYDKUjCcr5Z8y
w4oHLMevU/YyljNbCQTnpZbguJ0neU6bDKmjAZecE/e3rN4UJ80d/tNjcN7uCTiAulOi+wpAY7kF
wHBq4cWpx5YRaUZiiZLbAlQmzAbYict3oCyfG8lYtIrCqpZyIrDbfjLJldLo8LiORaD8ka1PpNV7
h3ojnSMgels9yZKMzzlkUFZu6xVHhleSpVFuEFRhQmOWZ4jxQbphzvNQKqCpx5xGfuMcMO6s3vBJ
0DyNBCcKEyYObaGqRhlkjk3yIGFAcaIs2a9pC82w39HIS0msEvO841qPyGXmCWe4TR9OUMEx5WyF
G10EGa5qUufiAvEwoioioBpR3bW5GMFKAcZCsU0vpG8yMGkYALemwVqtElcj8pSHiEFqmTQJ39Ly
PSWjmYauRBwyF24YVyMQCKpiogpcNShaqGlO4+WWUWiQRCy/NXoqkJVluy9agKS2rULsCctnZQbZ
yIUo/ERrYYqDI0bWObvWiqYW9tUGTksRJmz2vLvQz1/4u5IpwoSGmaOmgA==


--Boundary_(ID_DX0Pw8+fSSQRGHfP9JeLsA)--