1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup: remove reduntant variable

Browse Source
This commit is contained in:
Sergei Golubchik 2019-02-05 16:02:25 +01:00
parent 7dfbb66fcb
commit f07b76fcfd
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/mysql_install_db.sh
View File

@ -507,11 +507,9 @@ cat_sql()
case "$auth_root_authentication_method" in case "$auth_root_authentication_method" in
normal) normal)
echo "SET @skip_auth_root_nopasswd=NULL;"
echo "SET @auth_root_socket=NULL;" echo "SET @auth_root_socket=NULL;"
;; ;;
socket) socket)
echo "SET @skip_auth_root_nopasswd=1;"
echo "SET @auth_root_socket='$auth_root_socket_user';" echo "SET @auth_root_socket='$auth_root_socket_user';"
;; ;;
esac esac

2
scripts/mysql_system_tables_data.sql
View File

@ -42,7 +42,7 @@ IF @auth_root_socket is not null THEN
IF not exists(select 1 from information_schema.plugins where plugin_name='unix_socket') THEN IF not exists(select 1 from information_schema.plugins where plugin_name='unix_socket') THEN
INSTALL SONAME 'auth_socket'; END IF; END IF; INSTALL SONAME 'auth_socket'; END IF; END IF;
INSERT INTO global_priv SELECT * FROM tmp_user_nopasswd WHERE @had_user_table=0 AND @skip_auth_root_nopasswd IS NULL; INSERT INTO global_priv SELECT * FROM tmp_user_nopasswd WHERE @had_user_table=0 AND @auth_root_socket IS NULL;
INSERT INTO global_priv SELECT * FROM tmp_user_socket WHERE @had_user_table=0 AND @auth_root_socket IS NOT NULL; INSERT INTO global_priv SELECT * FROM tmp_user_socket WHERE @had_user_table=0 AND @auth_root_socket IS NOT NULL;
DROP TABLE tmp_user_nopasswd, tmp_user_socket; DROP TABLE tmp_user_nopasswd, tmp_user_socket;