diff options
author | Shauren <shauren.trinity@gmail.com> | 2018-12-09 14:44:25 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2018-12-09 14:44:25 +0100 |
commit | a70030ff252b266d12023ffada2a309409c1ccdb (patch) | |
tree | bb6598e5031879a029fed3b74cc3c36f09e29ebc /sql | |
parent | e32cfb58f1a46dadf4af6b06421e5b4085908664 (diff) |
SQL: Prepare merge
Diffstat (limited to 'sql')
-rw-r--r-- | sql/base/characters_database.sql | 6 | ||||
-rw-r--r-- | sql/updates/characters/master/2018_12_09_00_characters.sql (renamed from sql/updates/characters/master/2018_09_18_00_characters.sql) | 0 | ||||
-rw-r--r-- | sql/updates/characters/master/2018_12_09_01_characters.sql (renamed from sql/updates/characters/master/2018_10_10_00_characters.sql) | 0 | ||||
-rw-r--r-- | sql/updates/characters/master/2018_12_09_02_characters.sql (renamed from sql/updates/characters/master/2018_12_02_00_characters.sql) | 0 | ||||
-rw-r--r-- | sql/updates/hotfixes/master/2018_12_09_00_hotfixes.sql (renamed from sql/updates/hotfixes/master/2018_09_25_00_hotfixes.sql) | 0 | ||||
-rw-r--r-- | sql/updates/hotfixes/master/2018_12_09_01_hotfixes.sql (renamed from sql/updates/hotfixes/master/2018_10_16_00_hotfixes.sql) | 0 | ||||
-rw-r--r-- | sql/updates/hotfixes/master/2018_12_09_02_hotfixes.sql (renamed from sql/updates/hotfixes/master/2018_12_07_00_hotfixes.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/master/2018_12_09_01_world.sql (renamed from sql/updates/world/master/2018_09_25_00_world.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/master/2018_12_09_02_world.sql (renamed from sql/updates/world/master/2018_09_26_00_world.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/master/2018_12_09_03_world.sql (renamed from sql/updates/world/master/2018_10_16_00_world.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/master/2018_12_09_04_world.sql (renamed from sql/updates/world/master/2018_11_05_00_world.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/master/2018_12_09_05_world.sql (renamed from sql/updates/world/master/2018_11_07_00_world.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/master/2018_12_09_06_world.sql (renamed from sql/updates/world/master/2018_11_12_00_world.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/master/2018_12_09_07_world.sql (renamed from sql/updates/world/master/2018_12_02_00_world.sql) | 0 |
14 files changed, 3 insertions, 3 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 248f489fc5a..fa28bd1fa25 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -3569,9 +3569,9 @@ INSERT INTO `updates` VALUES ('2018_04_28_00_characters.sql','CBD0FDC0F32DE3F456F7CE3D9CAD6933CD6A50F5','RELEASED','2018-04-28 12:44:09',0), ('2018_07_28_00_characters.sql','31F66AE7831251A8915625EC7F10FA138AB8B654','RELEASED','2018-07-28 18:30:19',0), ('2018_07_31_00_characters.sql','7DA8D4A4534520B23E6F5BBD5B8EE205B799C798','RELEASED','2018-07-31 20:54:39',0), -('2018_09_18_00_characters.sql','7FE9641C93ED762597C08F1E9B6649C9EC2F0E47','RELEASED','2018-09-18 23:34:29',0), -('2018_10_10_00_characters.sql','C80B936AAD94C58A0F33382CED08CFB4E0B6AC34','RELEASED','2018-10-10 22:05:28',0), -('2018_12_02_00_characters.sql','DBBA0C06985CE8AC4E6E7E94BD6B2673E9ADFAE2','RELEASED','2018-12-02 17:32:31',0); +('2018_12_09_00_characters.sql','7FE9641C93ED762597C08F1E9B6649C9EC2F0E47','RELEASED','2018-09-18 23:34:29',0), +('2018_12_09_01_characters.sql','C80B936AAD94C58A0F33382CED08CFB4E0B6AC34','RELEASED','2018-10-10 22:05:28',0), +('2018_12_09_02_characters.sql','DBBA0C06985CE8AC4E6E7E94BD6B2673E9ADFAE2','RELEASED','2018-12-02 17:32:31',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/characters/master/2018_09_18_00_characters.sql b/sql/updates/characters/master/2018_12_09_00_characters.sql index 8a2dc041fe3..8a2dc041fe3 100644 --- a/sql/updates/characters/master/2018_09_18_00_characters.sql +++ b/sql/updates/characters/master/2018_12_09_00_characters.sql diff --git a/sql/updates/characters/master/2018_10_10_00_characters.sql b/sql/updates/characters/master/2018_12_09_01_characters.sql index 6ccb47f47e3..6ccb47f47e3 100644 --- a/sql/updates/characters/master/2018_10_10_00_characters.sql +++ b/sql/updates/characters/master/2018_12_09_01_characters.sql diff --git a/sql/updates/characters/master/2018_12_02_00_characters.sql b/sql/updates/characters/master/2018_12_09_02_characters.sql index 6c95b00778d..6c95b00778d 100644 --- a/sql/updates/characters/master/2018_12_02_00_characters.sql +++ b/sql/updates/characters/master/2018_12_09_02_characters.sql diff --git a/sql/updates/hotfixes/master/2018_09_25_00_hotfixes.sql b/sql/updates/hotfixes/master/2018_12_09_00_hotfixes.sql index 607af5502dd..607af5502dd 100644 --- a/sql/updates/hotfixes/master/2018_09_25_00_hotfixes.sql +++ b/sql/updates/hotfixes/master/2018_12_09_00_hotfixes.sql diff --git a/sql/updates/hotfixes/master/2018_10_16_00_hotfixes.sql b/sql/updates/hotfixes/master/2018_12_09_01_hotfixes.sql index 88498a167dc..88498a167dc 100644 --- a/sql/updates/hotfixes/master/2018_10_16_00_hotfixes.sql +++ b/sql/updates/hotfixes/master/2018_12_09_01_hotfixes.sql diff --git a/sql/updates/hotfixes/master/2018_12_07_00_hotfixes.sql b/sql/updates/hotfixes/master/2018_12_09_02_hotfixes.sql index 6588e2972fa..6588e2972fa 100644 --- a/sql/updates/hotfixes/master/2018_12_07_00_hotfixes.sql +++ b/sql/updates/hotfixes/master/2018_12_09_02_hotfixes.sql diff --git a/sql/updates/world/master/2018_09_25_00_world.sql b/sql/updates/world/master/2018_12_09_01_world.sql index e1942f967a1..e1942f967a1 100644 --- a/sql/updates/world/master/2018_09_25_00_world.sql +++ b/sql/updates/world/master/2018_12_09_01_world.sql diff --git a/sql/updates/world/master/2018_09_26_00_world.sql b/sql/updates/world/master/2018_12_09_02_world.sql index af7d0ed76d9..af7d0ed76d9 100644 --- a/sql/updates/world/master/2018_09_26_00_world.sql +++ b/sql/updates/world/master/2018_12_09_02_world.sql diff --git a/sql/updates/world/master/2018_10_16_00_world.sql b/sql/updates/world/master/2018_12_09_03_world.sql index 8a747a34db2..8a747a34db2 100644 --- a/sql/updates/world/master/2018_10_16_00_world.sql +++ b/sql/updates/world/master/2018_12_09_03_world.sql diff --git a/sql/updates/world/master/2018_11_05_00_world.sql b/sql/updates/world/master/2018_12_09_04_world.sql index 934627d98fb..934627d98fb 100644 --- a/sql/updates/world/master/2018_11_05_00_world.sql +++ b/sql/updates/world/master/2018_12_09_04_world.sql diff --git a/sql/updates/world/master/2018_11_07_00_world.sql b/sql/updates/world/master/2018_12_09_05_world.sql index 66371e87cff..66371e87cff 100644 --- a/sql/updates/world/master/2018_11_07_00_world.sql +++ b/sql/updates/world/master/2018_12_09_05_world.sql diff --git a/sql/updates/world/master/2018_11_12_00_world.sql b/sql/updates/world/master/2018_12_09_06_world.sql index d1f1f306a34..d1f1f306a34 100644 --- a/sql/updates/world/master/2018_11_12_00_world.sql +++ b/sql/updates/world/master/2018_12_09_06_world.sql diff --git a/sql/updates/world/master/2018_12_02_00_world.sql b/sql/updates/world/master/2018_12_09_07_world.sql index 9228a56d2b8..9228a56d2b8 100644 --- a/sql/updates/world/master/2018_12_02_00_world.sql +++ b/sql/updates/world/master/2018_12_09_07_world.sql |