|
@@ -171,7 +171,7 @@ function install_mariadb {
|
171
|
171
|
# See http://www.pontikis.net/blog/debian-9-stretch-rc3-web-server-setup-php7-mariadb
|
172
|
172
|
# https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin
|
173
|
173
|
function_check run_query
|
174
|
|
- run_query mysql "update mysql.user set plugin = '' where User='root'; flush privileges;"
|
|
174
|
+ run_query_root mysql "update mysql.user set plugin = '' where User='root'; flush privileges;"
|
175
|
175
|
|
176
|
176
|
mysqladmin -u root password "$MARIADB_PASSWORD"
|
177
|
177
|
mark_completed $FUNCNAME
|
|
@@ -285,6 +285,12 @@ function run_query {
|
285
|
285
|
mysql -u root --password="$MARIADB_PASSWORD" -e "$database_query" $database_name
|
286
|
286
|
}
|
287
|
287
|
|
|
288
|
+function run_query_root {
|
|
289
|
+ database_name=$1
|
|
290
|
+ database_query=$2
|
|
291
|
+ mysql -e "$database_query" $database_name
|
|
292
|
+}
|
|
293
|
+
|
288
|
294
|
function run_query_with_output {
|
289
|
295
|
database_name=$1
|
290
|
296
|
database_query=$2
|