diff --git a/build.inc b/build.inc index b206e85..7ed6fff 100644 --- a/build.inc +++ b/build.inc @@ -111,6 +111,8 @@ BuildMySQL() { -DWITH_EMBEDDED_SERVER=true \ -DCOMPILATION_COMMENT="openSUSE package" \ -DDENABLE_DOWNLOADS=false \ + -DINSTALL_PLUGINDIR_RPM="%{_libdir}/mysql/plugin" \ + -DINSTALL_LIBDIR_RPM="%{_libdir}" \ "$@" .. make %{?jobs:-j%jobs} nm --numeric-sort sql/mysqld > sql/mysqld.sym diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index 479f499..a1a220c 100644 --- a/configuration-tweaks.tar.bz2 +++ b/configuration-tweaks.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2b4528bfd705dccf6be532a58ace71daff468b7e2777a01f569836a29552488 -size 323 +oid sha256:03f98286d7ddf181361a0c4a2d4d8dc91a82ef76e292b72bcf2f14436344718b +size 309 diff --git a/mariadb.changes b/mariadb.changes index f51ae06..05a37c5 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 26 10:07:33 CEST 2013 - mhrusecky@suse.cz + +- fix ownership of logdir (bnc#763150) + ------------------------------------------------------------------- Thu Jul 25 13:08:06 CEST 2013 - mhrusecky@suse.cz diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2 index 446b786..6293313 100644 --- a/mysql-patches.tar.bz2 +++ b/mysql-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b34d03c24091c0a8120aae545ac9f0959b4167c21e7a1954819836bdf66a673 -size 11823 +oid sha256:48a241b4af682cfa423dc45e333ff80ffe9b6c2236c511ae54f7d3e53277e729 +size 11654 diff --git a/rc.mysql-multi b/rc.mysql-multi index de8fa0e..9afd44c 100644 --- a/rc.mysql-multi +++ b/rc.mysql-multi @@ -329,8 +329,9 @@ else log_dir="`dirname "$i"`" if [ \! -d "$log_dir" ]; then mkdir -p "$log_dir" - chmod 770 "$log_dir" fi + chmod 770 "$log_dir" + chown -R mysq;:mysql "$log_dir" done # We assume a fresh install if the directory $datadir/mysql