[arch-commits] Commit in percona-server/trunk (4 files)

Mon May 11 15:40:06 UTC 2015

Date: Monday, May 11, 2015 @ 17:40:06
  Author: mtorromeo
Revision: 133231

upgpkg: percona-server 5.6.24_72.2-1

Updated to 5.6.24_72.2 and used upstream's systemd and config files

Added:
  percona-server/trunk/my.cnf
Modified:
  percona-server/trunk/PKGBUILD
Deleted:
  percona-server/trunk/mysqld-post.sh
  percona-server/trunk/mysqld.service

----------------+
 PKGBUILD       |   24 +++++++++++++-----------
 my.cnf         |   38 ++++++++++++++++++++++++++++++++++++++
 mysqld-post.sh |    8 --------
 mysqld.service |   16 ----------------
 4 files changed, 51 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2015-05-11 12:57:41 UTC (rev 133230)
+++ PKGBUILD	2015-05-11 15:40:06 UTC (rev 133231)
@@ -3,7 +3,7 @@
 
 pkgbase=percona-server
 pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server')
-pkgver=5.6.23_72.1
+pkgver=5.6.24_72.2
 _pkgver=${pkgver/_/-}
 _myver=${pkgver/_rel*}
 pkgrel=1
@@ -12,8 +12,7 @@
 license=('GPL')
 url="http://www.percona.com/software/percona-server/"
 source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz"
-        'mysqld-post.sh'
-        'mysqld.service'
+        'my.cnf'
         'mysql-user.conf'
         'mysqld-tmpfile.conf'
         'mysql56-bufsize.patch')
@@ -21,8 +20,9 @@
 prepare() {
 	cd $pkgbase-$_pkgver
 	patch -p0 -i ../mysql56-bufsize.patch
-
 	rm -v sql/sql_yacc.{cc,h}
+	sed 's|$datadir/mysql.sock|/run/mysqld/mysqld.sock|' \
+	    -i packaging/rpm-fedora/mysql-systemd-start
 }
 
 build() {
@@ -32,6 +32,7 @@
 
 	cmake ../$pkgbase-$_pkgver \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_CONFIG=mysql_release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DSYSCONFDIR=/etc/mysql \
 		-DMYSQL_DATADIR=/var/lib/mysql \
@@ -80,7 +81,7 @@
 		make -C $dir DESTDIR="$pkgdir" install
 	done
 
-  rm "$pkgdir"/usr/lib/libmysqlservices.a
+	rm "$pkgdir"/usr/lib/libmysqlservices.a
 
 	install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config
 	install -d "$pkgdir"/usr/share/man/man1
@@ -119,12 +120,14 @@
 	cd build
 	make DESTDIR="$pkgdir" install
 
-	install -Dm644 "$pkgdir"/usr/share/mysql/my-default.cnf "$pkgdir"/etc/mysql/my.cnf
-	install -Dm755 ../mysqld-post.sh "$pkgdir"/usr/bin/mysqld-post
-	install -Dm644 ../mysqld.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+	install -Dm644 ../my.cnf "$pkgdir"/etc/mysql/my.cnf
 	install -Dm644 ../mysql-user.conf "$pkgdir"/usr/lib/sysusers.d/mysql.conf
 	install -Dm644 ../mysqld-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysqld.conf
 
+	cd ../$pkgbase-$_pkgver/packaging/rpm-fedora
+	install -Dm755 mysql-systemd-start "$pkgdir"/usr/bin/mysql-systemd-start
+	install -Dm644 mysqld.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+
 	# provided by libperconaserverclient
 	cd "$pkgdir"
 	rm usr/bin/mysql_config
@@ -141,9 +144,8 @@
 	rm usr/share/man/man1/mysql-test-run.pl.1
 }
 
-sha256sums=('5382630b98dd05f72e372ede5535ddcad2e389b594311a69f03a3d95f68d4907'
-            '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48'
-            '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869'
+sha256sums=('5aa6469f3a55fe0fd1cfe315f2f9cacb0ce318620086c93821c9000d6e25c0de'
+            'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83'
             'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e'
             'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60'
             '1039e232a7778544b00eb215c93bb06c588c95c2fd49cfb162dc50eb4dfbf729')

Added: my.cnf
===================================================================
--- my.cnf	                        (rev 0)
+++ my.cnf	2015-05-11 15:40:06 UTC (rev 133231)
@@ -0,0 +1,38 @@
+# For advice on how to change settings please see
+# http://dev.mysql.com/doc/refman/5.6/en/server-configuration-defaults.html
+
+[client]
+#password       = your_password
+port            = 3306
+socket          = /run/mysqld/mysqld.sock
+
+[mysqld]
+port            = 3306
+socket          = /run/mysqld/mysqld.sock
+datadir         = /var/lib/mysql
+
+#
+# Remove leading # and set to the amount of RAM for the most important data
+# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%.
+# innodb_buffer_pool_size = 128M
+#
+# Remove leading # to turn on a very important data integrity option: logging
+# changes to the binary log between backups.
+# log_bin
+#
+# Remove leading # to set options mainly useful for reporting servers.
+# The server defaults are faster for transactions and fast SELECTs.
+# Adjust sizes as needed, experiment to find the optimal values.
+# join_buffer_size = 128M
+# sort_buffer_size = 2M
+# read_rnd_buffer_size = 2M
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+# Recommended in standard MySQL setup
+sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
+
+[mysqld_safe]
+log-error       = /var/log/mysqld.log
+pid-file        = /run/mysqld/mysqld.pid

Deleted: mysqld-post.sh
===================================================================
--- mysqld-post.sh	2015-05-11 12:57:41 UTC (rev 133230)
+++ mysqld-post.sh	2015-05-11 15:40:06 UTC (rev 133231)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-while true; do
-	response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
-	echo "$response" | grep -q "mysqld is alive" && break
-	echo "$response" | grep -q "Access denied for user" && break
-	sleep 1
-done

Deleted: mysqld.service
===================================================================
--- mysqld.service	2015-05-11 12:57:41 UTC (rev 133230)
+++ mysqld.service	2015-05-11 15:40:06 UTC (rev 133231)
@@ -1,16 +0,0 @@
-[Unit]
-Description=MySQL database server
-After=syslog.target network.target
-
-[Service]
-User=mysql
-Group=mysql
-
-ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid
-ExecStartPost=/usr/bin/mysqld-post
-
-Restart=always
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target

