From d14f3d76752f311c6fe81ba808cf1131da517e29 Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Wed, 5 Jan 2005 03:43:37 +0100
Subject: [PATCH 1/2] Protect flags like -Wl,-O2 from being mangled by
 mysql_config (Bug #6964) (Second commit of this patch -- first included wrong
 changes.)

---
 scripts/mysql_config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index 86cbe944416..35ddbcac471 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -100,7 +100,7 @@ for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \
               DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \
               DEXTRA_DEBUG DHAVE_purify 'O[0-9]' 'W[-A-Za-z]*'
 do
-  cflags=`echo "$cflags"|sed -e "s/-$remove  *//g"` 
+  cflags=`echo "$cflags"|sed -e "s/ -$remove  */ /g"` 
 done
 cflags=`echo "$cflags"|sed -e 's/ *\$//'` 
 

From 2acb7387842baec2b3171afe7de08e1a52d7e8ce Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Thu, 6 Jan 2005 19:57:02 +0100
Subject: [PATCH 2/2] Add comment to make code for option-stripping in
 mysql_config more clear

---
 scripts/mysql_config.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index 35ddbcac471..3676e03ab48 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -100,6 +100,8 @@ for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \
               DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \
               DEXTRA_DEBUG DHAVE_purify 'O[0-9]' 'W[-A-Za-z]*'
 do
+  # The first option we might strip will always have a space before it because
+  # we set -I$pkgincludedir as the first option
   cflags=`echo "$cflags"|sed -e "s/ -$remove  */ /g"` 
 done
 cflags=`echo "$cflags"|sed -e 's/ *\$//'`