DB: Resolve pool id conflicts between branches

1 files changed, 91 insertions, 0 deletions

diff --git a/sql/updates/world/master/2020_08_14_01_world.sql b/sql/updates/world/master/2020_08_14_01_world.sql
new file mode 100644
index 00000000000..4b106acef93
--- /dev/null
+++ b/sql/updates/world/master/2020_08_14_01_world.sql
@@ -0,0 +1,91 @@
+UPDATE `pool_creature` SET `pool_entry`=40000 WHERE `pool_entry`=358;
+UPDATE `pool_creature` SET `pool_entry`=40001 WHERE `pool_entry`=359;
+UPDATE `pool_creature` SET `pool_entry`=40002 WHERE `pool_entry`=360;
+UPDATE `pool_creature` SET `pool_entry`=40003 WHERE `pool_entry`=361;
+UPDATE `pool_creature` SET `pool_entry`=40004 WHERE `pool_entry`=362;
+UPDATE `pool_creature` SET `pool_entry`=40005 WHERE `pool_entry`=370;
+UPDATE `pool_creature` SET `pool_entry`=40006 WHERE `pool_entry`=371;
+UPDATE `pool_creature` SET `pool_entry`=40007 WHERE `pool_entry`=372;
+UPDATE `pool_creature` SET `pool_entry`=40008 WHERE `pool_entry`=373;
+UPDATE `pool_creature` SET `pool_entry`=40009 WHERE `pool_entry`=374;
+UPDATE `pool_creature` SET `pool_entry`=40010 WHERE `pool_entry`=375;
+UPDATE `pool_creature` SET `pool_entry`=40011 WHERE `pool_entry`=376;
+UPDATE `pool_creature` SET `pool_entry`=40012 WHERE `pool_entry`=377;
+UPDATE `pool_creature` SET `pool_entry`=40013 WHERE `pool_entry`=378;
+UPDATE `pool_creature` SET `pool_entry`=40014 WHERE `pool_entry`=379;
+UPDATE `pool_creature` SET `pool_entry`=359 WHERE `pool_entry`=380;
+UPDATE `pool_creature` SET `pool_entry`=360 WHERE `pool_entry`=381;
+UPDATE `pool_creature` SET `pool_entry`=361 WHERE `pool_entry`=382;
+UPDATE `pool_creature` SET `pool_entry`=362 WHERE `pool_entry`=383;
+UPDATE `pool_creature` SET `pool_entry`=374 WHERE `pool_entry`=384;
+UPDATE `pool_creature` SET `pool_entry`=375 WHERE `pool_entry`=385;
+UPDATE `pool_creature` SET `pool_entry`=376 WHERE `pool_entry`=386;
+
+UPDATE `pool_gameobject` SET `pool_entry`=40000 WHERE `pool_entry`=358;
+UPDATE `pool_gameobject` SET `pool_entry`=40001 WHERE `pool_entry`=359;
+UPDATE `pool_gameobject` SET `pool_entry`=40002 WHERE `pool_entry`=360;
+UPDATE `pool_gameobject` SET `pool_entry`=40003 WHERE `pool_entry`=361;
+UPDATE `pool_gameobject` SET `pool_entry`=40004 WHERE `pool_entry`=362;
+UPDATE `pool_gameobject` SET `pool_entry`=40005 WHERE `pool_entry`=370;
+UPDATE `pool_gameobject` SET `pool_entry`=40006 WHERE `pool_entry`=371;
+UPDATE `pool_gameobject` SET `pool_entry`=40007 WHERE `pool_entry`=372;
+UPDATE `pool_gameobject` SET `pool_entry`=40008 WHERE `pool_entry`=373;
+UPDATE `pool_gameobject` SET `pool_entry`=40009 WHERE `pool_entry`=374;
+UPDATE `pool_gameobject` SET `pool_entry`=40010 WHERE `pool_entry`=375;
+UPDATE `pool_gameobject` SET `pool_entry`=40011 WHERE `pool_entry`=376;
+UPDATE `pool_gameobject` SET `pool_entry`=40012 WHERE `pool_entry`=377;
+UPDATE `pool_gameobject` SET `pool_entry`=40013 WHERE `pool_entry`=378;
+UPDATE `pool_gameobject` SET `pool_entry`=40014 WHERE `pool_entry`=379;
+UPDATE `pool_gameobject` SET `pool_entry`=359 WHERE `pool_entry`=380;
+UPDATE `pool_gameobject` SET `pool_entry`=360 WHERE `pool_entry`=381;
+UPDATE `pool_gameobject` SET `pool_entry`=361 WHERE `pool_entry`=382;
+UPDATE `pool_gameobject` SET `pool_entry`=362 WHERE `pool_entry`=383;
+UPDATE `pool_gameobject` SET `pool_entry`=374 WHERE `pool_entry`=384;
+UPDATE `pool_gameobject` SET `pool_entry`=375 WHERE `pool_entry`=385;
+UPDATE `pool_gameobject` SET `pool_entry`=376 WHERE `pool_entry`=386;
+
+UPDATE `pool_quest` SET `pool_entry`=40000 WHERE `pool_entry`=358;
+UPDATE `pool_quest` SET `pool_entry`=40001 WHERE `pool_entry`=359;
+UPDATE `pool_quest` SET `pool_entry`=40002 WHERE `pool_entry`=360;
+UPDATE `pool_quest` SET `pool_entry`=40003 WHERE `pool_entry`=361;
+UPDATE `pool_quest` SET `pool_entry`=40004 WHERE `pool_entry`=362;
+UPDATE `pool_quest` SET `pool_entry`=40005 WHERE `pool_entry`=370;
+UPDATE `pool_quest` SET `pool_entry`=40006 WHERE `pool_entry`=371;
+UPDATE `pool_quest` SET `pool_entry`=40007 WHERE `pool_entry`=372;
+UPDATE `pool_quest` SET `pool_entry`=40008 WHERE `pool_entry`=373;
+UPDATE `pool_quest` SET `pool_entry`=40009 WHERE `pool_entry`=374;
+UPDATE `pool_quest` SET `pool_entry`=40010 WHERE `pool_entry`=375;
+UPDATE `pool_quest` SET `pool_entry`=40011 WHERE `pool_entry`=376;
+UPDATE `pool_quest` SET `pool_entry`=40012 WHERE `pool_entry`=377;
+UPDATE `pool_quest` SET `pool_entry`=40013 WHERE `pool_entry`=378;
+UPDATE `pool_quest` SET `pool_entry`=40014 WHERE `pool_entry`=379;
+UPDATE `pool_quest` SET `pool_entry`=359 WHERE `pool_entry`=380;
+UPDATE `pool_quest` SET `pool_entry`=360 WHERE `pool_entry`=381;
+UPDATE `pool_quest` SET `pool_entry`=361 WHERE `pool_entry`=382;
+UPDATE `pool_quest` SET `pool_entry`=362 WHERE `pool_entry`=383;
+UPDATE `pool_quest` SET `pool_entry`=374 WHERE `pool_entry`=384;
+UPDATE `pool_quest` SET `pool_entry`=375 WHERE `pool_entry`=385;
+UPDATE `pool_quest` SET `pool_entry`=376 WHERE `pool_entry`=386;
+
+UPDATE `pool_template` SET `entry`=40000 WHERE `entry`=358;
+UPDATE `pool_template` SET `entry`=40001 WHERE `entry`=359;
+UPDATE `pool_template` SET `entry`=40002 WHERE `entry`=360;
+UPDATE `pool_template` SET `entry`=40003 WHERE `entry`=361;
+UPDATE `pool_template` SET `entry`=40004 WHERE `entry`=362;
+UPDATE `pool_template` SET `entry`=40005 WHERE `entry`=370;
+UPDATE `pool_template` SET `entry`=40006 WHERE `entry`=371;
+UPDATE `pool_template` SET `entry`=40007 WHERE `entry`=372;
+UPDATE `pool_template` SET `entry`=40008 WHERE `entry`=373;
+UPDATE `pool_template` SET `entry`=40009 WHERE `entry`=374;
+UPDATE `pool_template` SET `entry`=40010 WHERE `entry`=375;
+UPDATE `pool_template` SET `entry`=40011 WHERE `entry`=376;
+UPDATE `pool_template` SET `entry`=40012 WHERE `entry`=377;
+UPDATE `pool_template` SET `entry`=40013 WHERE `entry`=378;
+UPDATE `pool_template` SET `entry`=40014 WHERE `entry`=379;
+UPDATE `pool_template` SET `entry`=359 WHERE `entry`=380;
+UPDATE `pool_template` SET `entry`=360 WHERE `entry`=381;
+UPDATE `pool_template` SET `entry`=361 WHERE `entry`=382;
+UPDATE `pool_template` SET `entry`=362 WHERE `entry`=383;
+UPDATE `pool_template` SET `entry`=374 WHERE `entry`=384;
+UPDATE `pool_template` SET `entry`=375 WHERE `entry`=385;
+UPDATE `pool_template` SET `entry`=376 WHERE `entry`=386;