Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

BitKeeper/etc/config

@@ -75,5 +75,6 @@ hours:
 [tomas:]checkout:get
 [guilhem:]checkout:get
 [pekka:]checkout:get
+[msvensson:]checkout:get
 checkout:edit
 eoln:unix

mysql-test/t/mysql.test

@@ -85,7 +85,6 @@ drop table t1;
 --exec $MYSQL test -e "select unhex('zz');" 
 --exec $MYSQL -t test -e "select unhex('zz');" 
 
-#
 # Bug#19265 describe command does not work from mysql prompt
 #
 

scripts/mysql_config.sh

@@ -101,7 +101,7 @@ ldflags='@LDFLAGS@'
 libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@"
 libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@"
-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@"
+embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@"
 
 cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
 include="-I$pkgincludedir"