Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-03-29 16:27:21 +0200
committerErich Eckner <git@eckner.net>2018-03-29 16:27:21 +0200
commitedefe4468a071b3e0252d047d2c030f3abf3c483 (patch)
tree91f90084f7173b5d34f06dfee3009645e517ae71
parent2e95564029e21323a58f80589aebd7c16448c507 (diff)
move calculation of mysql_files_table_partitions from lib/mysql-functions to conf/default.conf - $work_dir was not yet set
-rwxr-xr-xconf/default.conf11
-rwxr-xr-xlib/mysql-functions10
2 files changed, 11 insertions, 10 deletions
diff --git a/conf/default.conf b/conf/default.conf
index efbb5b4..ff87f53 100755
--- a/conf/default.conf
+++ b/conf/default.conf
@@ -156,3 +156,14 @@ if [ "${master_build_server_identity}" = "${work_dir}/.ssh/id_rsa" ] && \
mkdir -p "${master_build_server_identity%/*}"
ssh-keygen -b4096 -f "${master_build_server_identity}"
fi
+
+mysql_files_table_partitions=$(
+ # shellcheck disable=SC2016
+ printf 'SHOW CREATE TABLE `files`;\n' | \
+ mysql_run_query | \
+ sed -n '
+ s/^.*PARTITIONS \([0-9]\+\) .*$/\1/
+ T
+ p
+ '
+)
diff --git a/lib/mysql-functions b/lib/mysql-functions
index 7619c10..0625616 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -1232,13 +1232,3 @@ mysql_insert_package_files_query() {
done
}
-
-mysql_files_table_partitions=$(
- printf 'SHOW CREATE TABLE `files`;\n' | \
- mysql_run_query | \
- sed -n '
- s/^.*PARTITIONS \([0-9]\+\) .*$/\1/
- T
- p
- '
-)