diff -urN mysql-extras.orig/000_index.txt mysql-extras-20080619/000_index.txt
--- mysql-extras.orig/000_index.txt	2008-06-27 12:30:33.000000000 +1000
+++ mysql-extras-20080619/000_index.txt	2008-06-19 18:49:47.000000000 +1000
@@ -197,7 +197,7 @@
 @patch 105_all_mysql_config_cleanup.patch
 @ver 4.01.22.00 to 4.01.99.99
 @ver 5.00.26.00 to 5.00.56.00
-@ver 5.01.21.99 to 5.01.99.99
+@ver 5.01.21.99 to 5.01.24.99
 @pn mysql
 @pn mysql-community
 @pn mysql-slotted
@@ -211,6 +211,13 @@
 @pn mysql-slotted
 @@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS
 
+@patch 105_all_mysql_config_cleanup-5.1.25.patch
+@ver 5.01.25.00 to 5.01.99.99
+@pn mysql
+@pn mysql-community
+@pn mysql-slotted
+@@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS
+
 @patch 200_all_query-logging-bypass-4.1.19.patch
 @ver 4.01.14.00 to 4.01.99.99
 @pn mysql
@@ -354,7 +361,7 @@
 @@ Fix for InnoDB 'CONTAINS' DoS (gentoo bug #198988, upstream bug #32125)
 
 @patch 709_all_innodb_spatial_crash_mybug_32125_5.1.patch
-@ver 5.01.22.00 to 5.01.99.99
+@ver 5.01.22.00 to 5.01.22.99
 @pn mysql
 @pn mysql-community
 @pn mysql-slotted
@@ -415,6 +422,7 @@
 
 @patch 715_all_mysql_config_libdir.patch
 @ver 5.00.50.00 to 5.00.99.99
+@ver 5.01.00.00 to 5.01.25.99
 @pn mysql
 @pn mysql-community
 @pn mysql-slotted
diff -urN mysql-extras.orig/105_all_mysql_config_cleanup-5.1.25.patch mysql-extras-20080619/105_all_mysql_config_cleanup-5.1.25.patch
--- mysql-extras.orig/105_all_mysql_config_cleanup-5.1.25.patch	1970-01-01 10:00:00.000000000 +1000
+++ mysql-extras-20080619/105_all_mysql_config_cleanup-5.1.25.patch	2008-06-19 18:55:44.000000000 +1000
@@ -0,0 +1,46 @@
+--- mysql.orig/scripts/mysql_config.sh	2008-06-19 18:54:15.000000000 +1000
++++ mysql/scripts/mysql_config.sh	2008-06-19 18:54:58.000000000 +1000
+@@ -122,23 +122,28 @@
+ cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
+ include="-I$pkgincludedir"
+ 
+-# Remove some options that a client doesn't have to care about
+-# FIXME until we have a --cxxflags, we need to remove -Xa
+-#       and -xstrconst to make --cflags usable for Sun Forte C++
+-# FIXME until we have a --cxxflags, we need to remove -AC99
+-#       to make --cflags usable for HP C++ (aCC)
+-for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \
+-              DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \
+-              DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \
+-              'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \
+-              Xa xstrconst "xc99=none" AC99 \
+-              unroll2 ip mp restrict
++tmpcflags=""
++for f in $cflags
+ 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"` 
++  case "${f}" in
++    -DDBUG_OFF) f="" ;;
++    -DSAFEMALLOC) f="" ;;
++    -USAFEMALLOC) f="" ;;
++    -DSAFE_MUTEX) f="" ;;
++    -DPEDANTIC_SAFEMALLOC) f="" ;;
++    -DUNIV_MUST_NOT_INLINE) f="" ;;
++    -DFORCE_INIT_OF_VARS) f="" ;;
++    -DEXTRA_DEBUG) f="" ;;
++    -DHAVE_purify) f="" ;;
++    -[ID]*) tmpcflags="${tmpcflags} ${f}" ;;
++    -[Ll]*)
++      libs="${libs} ${f}"
++      libs_r="${libs_r} ${f}"
++      embedded_libs="${embedded_libs} ${f}"
++    ;;
++  esac
+ done
+-cflags=`echo "$cflags"|sed -e 's/ *\$//'` 
++cflags="${tmpcflags# }"
+ 
+ # Same for --libs(_r)
+ for remove in lmtmalloc static-libcxa i-static static-intel