Просмотр исходного кода

Merge pull request #53 from desec-io/20170622_fix_mysql_rootlogin

fix(db): init command violated unique constraint
Peter Thomassen 8 лет назад
Родитель
Сommit
a5f64e711b
3 измененных файлов с 6 добавлено и 3 удалено
  1. 2 1
      dbapi/initdb.d/99-finish.sql
  2. 2 1
      dblord/initdb.d/99-finish.sql
  3. 2 1
      dbmaster/initdb.d/99-finish.sql

+ 2 - 1
dbapi/initdb.d/99-finish.sql

@@ -1,4 +1,5 @@
 -- Narrow down root logins
 INSTALL PLUGIN unix_socket SONAME 'auth_socket';
-UPDATE mysql.user SET Host = 'localhost', plugin = 'unix_socket' WHERE User = 'root';
+DELETE FROM mysql.user WHERE User = 'root' AND Host != 'localhost';
+UPDATE mysql.user SET plugin = 'unix_socket' WHERE User = 'root' AND Host = 'localhost';
 FLUSH PRIVILEGES;

+ 2 - 1
dblord/initdb.d/99-finish.sql

@@ -1,4 +1,5 @@
 -- Narrow down root logins
 INSTALL PLUGIN unix_socket SONAME 'auth_socket';
-UPDATE mysql.user SET Host = 'localhost', plugin = 'unix_socket' WHERE User = 'root';
+DELETE FROM mysql.user WHERE User = 'root' AND Host != 'localhost';
+UPDATE mysql.user SET plugin = 'unix_socket' WHERE User = 'root' AND Host = 'localhost';
 FLUSH PRIVILEGES;

+ 2 - 1
dbmaster/initdb.d/99-finish.sql

@@ -1,4 +1,5 @@
 -- Narrow down root logins
 INSTALL PLUGIN unix_socket SONAME 'auth_socket';
-UPDATE mysql.user SET Host = 'localhost', plugin = 'unix_socket' WHERE User = 'root';
+DELETE FROM mysql.user WHERE User = 'root' AND Host != 'localhost';
+UPDATE mysql.user SET plugin = 'unix_socket' WHERE User = 'root' AND Host = 'localhost';
 FLUSH PRIVILEGES;