Updated manual about embedded version.

Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version.  All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86

1 files changed, 8 insertions, 5 deletions

diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index ed344f4b1e3..b2a09173760 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -31,16 +31,18 @@ client_libs='@CLIENT_LIBS@'
 
 libs="$ldflags -L'$pkglibdir' -lmysqlclient $client_libs"
 cflags="-I'$pkgincludedir'"
+embedded_libs="$ldflags -L'$pkglibdir' -lmysqld @LIBS@ @innodb_system_libs@"
 
 usage () {
         cat <<EOF
 Usage: $0 [OPTIONS]
 Options:
-        --cflags        [$cflags]
-        --libs          [$libs]
-        --socket        [$socket]
-        --port          [$port]
-        --version       [$version]
+        --cflags         [$cflags]
+        --libs           [$libs]
+        --socket         [$socket]
+        --port           [$port]
+        --version        [$version]
+	--libmysqld-libs [$embedded_libs]
 EOF
         exit 1
 }
@@ -54,6 +56,7 @@ while test $# -gt 0; do
         --socket)  echo "$socket" ;;
         --port)    echo "$port" ;;
         --version) echo "$version" ;;
+	--embedded-libs | --embedded | libmysqld-libs) echo "$embedded_libs" ;;
         *)         usage ;;
         esac