X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-mysql;h=7256041bc75add8e3968a3b6ba7d13aa9deaa6f0;hb=b5bfb2006502b57fab234345a2393fd04e6d55ad;hp=2cc93cec3b10b9009e0172019441cc38940d6547;hpb=8c1ceecd26d41af612337eb87f51fa1d353d6c8a;p=hvlinux.git

diff --git a/stage3/cis-mysql b/stage3/cis-mysql
index 2cc93ce..7256041 100755
--- a/stage3/cis-mysql
+++ b/stage3/cis-mysql
@@ -15,7 +15,7 @@ hv_groupadd mysql
 hv_useradd -c mysql -d /dev/null -g mysql -s /bin/false mysql
 
 cd ${LFS_TMP}/${1}
-CPPFLAGS="-D_GNU_SOURCE" ./configure \
+./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/sbin \
@@ -23,18 +23,21 @@ CPPFLAGS="-D_GNU_SOURCE" ./configure \
     --enable-thread-safe-client \
     --enable-assembler \
     --enable-local-infile \
-    --with-named-thread-libs=-lpthread \
     --with-unix-socket-path=/var/run/mysql/mysql.sock \
     --without-debug \
-    --without-bench \
-    --without-readline
-make testdir=/usr/lib/mysql/mysql-test
-make testdir=/usr/lib/mysql/mysql-test install
+    --without-readline \
+    --with-plugins=innobase,myisam \
+    --with-extra-charsets=all \
+    --with-ssl
+make
+make benchdir_root=/tmp/mysql-bench install
+rm -rf /tmp/mysql
 cd /usr/lib
-ln -sf mysql/libmysqlclient{,_r}.so* .
+ln -v -sf mysql/libmysqlclient{,_r}.so* .
 
 # Copying default configuration file.
-cp /usr/share/mysql/my-medium.cnf /etc/my.cnf
+install -v -m644 /usr/share/mysql/my-medium.cnf /etc/my.cnf
+sed -i -e s/^skip-federated/#skip-federated/ /etc/my.cnf
 
 mysql_install_db --user=mysql
 chgrp mysql /srv/mysql{,/test,/mysql}