From 30cfda089fdbeb2915c35e0609984189a9855b73 Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Fri, 17 Dec 2010 23:08:43 +0000 Subject: bug#51925: 5.5 installed header file layout is incorrect The 'mysql' include sub-directory was copied directly into include/ rather than retaining its own directory. Fix this, and update mysql_config which needs additional logic to detect the correct prefix for includes. --- scripts/mysql_config.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts/mysql_config.sh') diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 69ec88d6724..97a8a723043 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -92,7 +92,11 @@ 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 +if [ -f $basedir/include/mysql/mysql.h ]; then + pkgincludedir="$basedir/include/mysql" +elif [ -f $basedir/include/mysql.h ]; then + pkgincludedir="$basedir/include" +fi version='@VERSION@' socket='@MYSQL_UNIX_ADDR@' -- cgit v1.2.1 From da97e272194fedddec730d1ed02bd98ae73d1768 Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Fri, 17 Dec 2010 23:13:33 +0000 Subject: bug#51925: 5.5 installed header file layout is incorrect Additional space-in-directory-name protection. --- scripts/mysql_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/mysql_config.sh') diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 97a8a723043..67484ec13b7 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -92,9 +92,9 @@ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin pkgincludedir='@pkgincludedir@' -if [ -f $basedir/include/mysql/mysql.h ]; then +if [ -f "$basedir/include/mysql/mysql.h" ]; then pkgincludedir="$basedir/include/mysql" -elif [ -f $basedir/include/mysql.h ]; then +elif [ -f "$basedir/include/mysql.h" ]; then pkgincludedir="$basedir/include" fi -- cgit v1.2.1