diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-07-16 21:43:52 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-07-16 21:43:52 +0200 |
| commit | 235cdc2fd5c72e8dd8a91fb53a1b90babef24047 (patch) | |
| tree | 77bdec07a3ae367ccb7e0a5a69617815e6deadcc | |
| parent | ddf16ae4d9eff6e849618bb6c5a00603f26daa93 (diff) | |
SQL: Rename old sql to resolve naming conflict between branches
| -rw-r--r-- | sql/base/auth_database.sql | 2 | ||||
| -rw-r--r-- | sql/old/3.3.5a/auth/63_2018_02_19/2017_06_28_00_auth_rbac.sql (renamed from sql/old/3.3.5a/auth/63_2018_02_19/2017_06_28_00_auth.sql) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index ec0018bb2b1..8627f10817b 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -1922,7 +1922,7 @@ INSERT INTO `updates` VALUES ('2017_06_12_01_auth.sql','661B4935E101AF188BEBF43203144104E89F8C54','ARCHIVED','2017-06-12 00:00:01',0), ('2017_06_12_02_auth.sql','166F059E411FAA4901BBBA09A41EF07B1CADC4B6','ARCHIVED','2017-06-12 00:00:02',0), ('2017_06_17_00_auth.sql','4A172895CB9DA8EFE1270434D6ECB22D4F4DCB17','ARCHIVED','2017-06-17 00:00:00',0), -('2017_06_28_00_auth.sql','D32EF80F57F629C23395D80F06E91D7E40719F83','ARCHIVED','2017-06-28 00:00:00',0), +('2017_06_28_00_auth_rbac.sql','D32EF80F57F629C23395D80F06E91D7E40719F83','ARCHIVED','2017-06-28 00:00:00',0), ('2017_08_01_00_auth.sql','6ECE808AF52345177189E962C0606B769B6806A6','ARCHIVED','2017-08-01 00:00:00',0), ('2017_10_13_00_auth.sql','87674E0D166AC60E3725B445714427892E42C6FE','ARCHIVED','2017-10-13 00:00:00',0), ('2017_10_29_00_auth.sql','F742569F56BB29CE9C8DBBD40A6AB474F846485C','ARCHIVED','2017-10-29 00:00:00',0), diff --git a/sql/old/3.3.5a/auth/63_2018_02_19/2017_06_28_00_auth.sql b/sql/old/3.3.5a/auth/63_2018_02_19/2017_06_28_00_auth_rbac.sql index e854b107804..e854b107804 100644 --- a/sql/old/3.3.5a/auth/63_2018_02_19/2017_06_28_00_auth.sql +++ b/sql/old/3.3.5a/auth/63_2018_02_19/2017_06_28_00_auth_rbac.sql |