database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Manual merge from mysql-trunk.

Browse Source 
Conflicts:
  - scripts/CMakeLists.txt
This commit is contained in:
Alexander Nozdrin
2010-07-19 18:00:29 +04:00
parent 83c154dc34 226852ea14
commit 9503a8e23f
16 changed files with 262 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/mysql_config.sh
View File

@ -88,6 +88,8 @@ pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
fix_path pkglibdir $pkglibdir_rel lib/mysql lib
plugindir='@pkgplugindir@'
plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
pkgincludedir='@pkgincludedir@'
fix_path pkgincludedir include/mysql include