Manual merge from mysql-trunk.

Conflicts:
  - scripts/CMakeLists.txt
This commit is contained in:
Alexander Nozdrin 2010-07-19 18:00:29 +04:00
commit b5eac2b2ce
16 changed files with 260 additions and 76 deletions

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