diff options
| -rw-r--r-- | BitKeeper/etc/config | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysql.test | 1 | ||||
| -rw-r--r-- | scripts/mysql_config.sh | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config index 6d06edd193e..1a027813ff4 100644 --- a/BitKeeper/etc/config +++ b/BitKeeper/etc/config @@ -75,5 +75,6 @@ hours: [tomas:]checkout:get [guilhem:]checkout:get [pekka:]checkout:get +[msvensson:]checkout:get checkout:edit eoln:unix diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 57c4854bf06..9e3eabf474b 100644 --- a/mysql-test/t/mysql.test +++ b/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 # diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 84ff518c381..fa25d7973eb 100644 --- a/scripts/mysql_config.sh +++ b/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" |