ERP5: remove redundant mysql --user argument

stack/erp5/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [mariadb-resiliency-after-import-script]
 filename = instance-mariadb-resiliency-after-import-script.sh.in
-md5sum = aff3bb574c8f0a2db9911fee30540e12
+md5sum = 85ce1e2f3d251aa435fef8118dca8a63
 
 [mariadb-slow-query-report-script]
 filename = mysql-querydigest.sh.in
@@ -22,11 +22,11 @@ md5sum = 0c0d98a68230cd0ad36046bb25b35f4a
 
 [mariadb-start-clone-from-backup]
 filename = instance-mariadb-start-clone-from-backup.sh.in
-md5sum = d95e8500bdc72d1f40b97cc414656e7e
+md5sum = d10b8e35b02b5391cf46bf0c7dbb1196
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = b29449652ef996c267518e4dcfd8e9e1
+md5sum = 0eb2f45a145dde0c59d3488bfdbe66ff
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in

stack/erp5/instance-mariadb-resiliency-after-import-script.sh.in

@@ -59,7 +59,7 @@ fi
 echo "Importing data..."
 # Use latest dump XXX can contain funny characters
 dump=$(ls -r "$mariadb_backup_directory" | head -1)
-zcat "$mariadb_backup_directory/$dump" | $mysql_executable -u root || {
+zcat "$mariadb_backup_directory/$dump" | $mysql_executable || {
   RESTORE_EXIT_CODE=$?
   echo 'Backup restoration failed.'
   exit $RESTORE_EXIT_CODE

stack/erp5/instance-mariadb-start-clone-from-backup.sh.in

@@ -84,16 +84,16 @@ done
 "$UPDATE"
 
 echo "Importing $BACKUP ..."
-zcat "$BACKUP" | "$CLIENT" -u root
+zcat "$BACKUP" | "$CLIENT"
 
 echo "Configuring server as slave..."
 if [ "$MASTER_USE_GTID" -eq 1 ]; then
-  "$CLIENT" -u root -e "$SQL_SET_GTID"
+  "$CLIENT" -e "$SQL_SET_GTID"
   MASTER_USE_GTID_SQL="slave_pos"
 else
   MASTER_USE_GTID_SQL="NO"
 fi
-"$CLIENT" -u root -e "
+"$CLIENT" -e "
   CHANGE MASTER TO
   MASTER_HOST='$MASTER_HOST',
   MASTER_USER='$MASTER_USER',
@@ -111,9 +111,9 @@ if [ "$MASTER_USE_GTID" -eq 0 ]; then
   # Notes:
   # - Must happen after setting MASTER_HOST & MASTER_PORT.
   # - Implicitly sets MASTER_USE_GTID=NO if it was set before.
-  "$CLIENT" -u root -e "$SQL_CHANGE_MASTER"
+  "$CLIENT" -e "$SQL_CHANGE_MASTER"
 fi
-"$CLIENT" -u root -e "START SLAVE;"
+"$CLIENT" -e "START SLAVE;"
 
 echo "Stopping mariadb..."
 trap EXIT

stack/erp5/instance-mariadb.cfg.in

@@ -107,7 +107,7 @@ time = {{ dumps(backup_periodicity) }}
 #   can be fully restored.
 # master-data: use value "2" as we are not in a replication case
 #}
-command = "${binary-wrap-mysqldump:wrapper-path}" -u root --all-databases --flush-privileges --single-transaction --max-allowed-packet=128M {% if incremental_backup_retention_days > -1 %}--flush-logs --master-data=2 {% endif %}| {{ parameter_dict['gzip-location'] }}/bin/gzip > "${directory:mariadb-backup-full}/$({{ parameter_dict['coreutils-location'] }}/bin/date "+%Y%m%d%H%M%S").sql.gz"
+command = "${binary-wrap-mysqldump:wrapper-path}" --all-databases --flush-privileges --single-transaction --max-allowed-packet=128M {% if incremental_backup_retention_days > -1 %}--flush-logs --master-data=2 {% endif %}| {{ parameter_dict['gzip-location'] }}/bin/gzip > "${directory:mariadb-backup-full}/$({{ parameter_dict['coreutils-location'] }}/bin/date "+%Y%m%d%H%M%S").sql.gz"
 {# KEEP GLOB PATTERN IN SYNC with generated filenames above
 #           YYYYmmddHHMMSS -#}
 file-glob = ??????????????.sql.gz
@@ -206,7 +206,7 @@ context = section parameter_dict odbc-ini-text
 < = logrotate-entry-base
 name = mariadb
 log = ${my-cnf-parameters:error-log} ${my-cnf-parameters:slow-query-log}
-post = "${binary-wrap-mysql:wrapper-path}" -B -u root -e "FLUSH LOGS"
+post = "${binary-wrap-mysql:wrapper-path}" -B -e "FLUSH LOGS"
 
 [{{ section('binary-link') }}]
 recipe = slapos.cookbook:symbolic.link