diff options
| author |   Brian Evans <grknight@tuffmail.com> | 2014-04-25 21:25:54 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@tuffmail.com> | 2014-04-25 21:25:54 -0400 |
| commit | c70f878ff23d999347f96d312ead0c8c56851684 (patch) | |
| tree | d4e83767e665721969f4d7b0bc7a46e6a4054f00 /20006_all_cmake_elib-mysql-5.5.37.patch | |
| parent | Fix embedded library location in ELIB patches for 5.5 (diff) | |
| download | mysql-extras-c70f878ff23d999347f96d312ead0c8c56851684.tar.gz mysql-extras-c70f878ff23d999347f96d312ead0c8c56851684.tar.bz2 mysql-extras-c70f878ff23d999347f96d312ead0c8c56851684.zip | |
Fix embedded library location in ELIB patches for 5.5
Signed-off-by: Brian Evans <grknight@tuffmail.com>
Diffstat (limited to '20006_all_cmake_elib-mysql-5.5.37.patch')
| -rw-r--r-- | 20006_all_cmake_elib-mysql-5.5.37.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/20006_all_cmake_elib-mysql-5.5.37.patch b/20006_all_cmake_elib-mysql-5.5.37.patch index d712067..1f328c2 100644 --- a/20006_all_cmake_elib-mysql-5.5.37.patch +++ b/20006_all_cmake_elib-mysql-5.5.37.patch @@ -171,8 +171,8 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt +ENDIF() diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt ---- a/mysql/scripts/CMakeLists.txt 2014-04-15 07:02:28.000000000 -0400 -+++ b/mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.000000000 -0400 +--- mysql-old/scripts/CMakeLists.txt 2014-04-15 07:02:28.000000000 -0400 ++++ mysql/scripts/CMakeLists.txt 2014-04-25 19:24:14.000000000 -0400 @@ -198,6 +198,7 @@ SET(scriptdir ${prefix}/${INSTALL_BINDIR}) SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) @@ -182,8 +182,8 @@ diff -aurN a/mysql/scripts/CMakeLists.txt b/mysql/scripts/CMakeLists.txt SET(localstatedir ${prefix}/data) ELSE() diff -aurN a/mysql/scripts/mysql_config.pl.in b/mysql/scripts/mysql_config.pl.in ---- a/mysql/scripts/mysql_config.pl.in 2014-04-15 07:02:39.000000000 -0400 -+++ b/mysql/scripts/mysql_config.pl.in 2014-04-25 19:28:48.000000000 -0400 +--- mysql-old/scripts/mysql_config.pl.in 2014-04-15 07:02:39.000000000 -0400 ++++ mysql/scripts/mysql_config.pl.in 2014-04-25 19:28:48.000000000 -0400 @@ -190,9 +190,10 @@ else { @@ -197,8 +197,8 @@ diff -aurN a/mysql/scripts/mysql_config.pl.in b/mysql/scripts/mysql_config.pl.in my $flags; diff -aurN a/mysql/scripts/mysql_config.sh b/mysql/scripts/mysql_config.sh ---- a/mysql/scripts/mysql_config.sh 2014-04-25 20:05:16.000000000 -0400 -+++ b/mysql/scripts/mysql_config.sh 2014-04-25 20:08:01.000000000 -0400 +--- mysql-old/scripts/mysql_config.sh 2014-04-25 20:05:16.000000000 -0400 ++++ mysql/scripts/mysql_config.sh 2014-04-25 20:08:01.000000000 -0400 @@ -91,6 +91,10 @@ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin |