diff --git a/appveyor.yml b/appveyor.yml index 7cf92124e002d..d5c53854bf3cf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,8 +4,25 @@ clone_depth: 1 init: - ps: '' environment: - BOOST_ROOT: C:\Libraries\boost_1_73_0 - OPENSSL_ROOT_DIR: C:\OpenSSL-v111-Win64 + BOOST_ROOT: C:\Libraries\boost_1_83_0 + MYSQL_ROOT_DIR: C:\mysql-8.1.0-winx64 + OPENSSL_ROOT_DIR: C:\OpenSSL-v30-Win64 +install: +- ps: >- + Write-Host "Installing MySQL Server 8.1" -ForegroundColor Cyan + + Write-Host "Downloading MySQL..." + + $zipPath = "$($env:temp)\mysql-8.1.0-winx64.zip" + + (New-Object Net.WebClient).DownloadFile('https://cdn.mysql.com//Downloads/MySQL-8.1/mysql-8.1.0-winx64.zip', $zipPath) + + Write-Host "Unpacking..." + + 7z x $zipPath -o"C:\" | Out-Null + + Write-Host "MySQL Server 8.1 installed" -ForegroundColor Cyan + build_script: - cmd: >- git config user.email "appveyor@build.bot" && git config user.name "AppVeyor" @@ -18,11 +35,13 @@ build_script: cd bin\RelWithDebInfo\ - copy "C:\Program Files\MySQL\MySQL Server 5.7\lib\libmysql.dll" libmysql.dll + copy "%MYSQL_ROOT_DIR%\lib\libmysql.dll" libmysql.dll + + copy "%OPENSSL_ROOT_DIR%\libssl-3-x64.dll" libssl-3-x64.dll - copy "%OPENSSL_ROOT_DIR%\libssl-1_1-x64.dll" libssl-1_1-x64.dll + copy "%OPENSSL_ROOT_DIR%\libcrypto-3-x64.dll" libcrypto-3-x64.dll - copy "%OPENSSL_ROOT_DIR%\libcrypto-1_1-x64.dll" libcrypto-1_1-x64.dll + copy "%OPENSSL_ROOT_DIR%\bin\legacy.dll" legacy.dll cd .. diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 7edbe051fa2da..42411ef0c95d8 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -2535,7 +2535,7 @@ DROP TABLE IF EXISTS `reserved_name`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!50503 SET character_set_client = utf8mb4 */; CREATE TABLE `reserved_name` ( - `name` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `name` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL, PRIMARY KEY (`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Player Reserved Names'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2681,7 +2681,8 @@ INSERT INTO `updates` VALUES ('2023_02_05_00_characters.sql','DD3F2181CC472A040EC4AE49EBB057C1FAA5BE10','ARCHIVED','2023-01-16 14:51:30',0), ('2023_02_05_01_characters.sql','336E62A8850A3E78A1D0BD3E81FFD5769184BDF8','ARCHIVED','2023-02-05 15:58:32',0), ('2023_05_19_00_characters.sql','5E0C9338554BAA481566EDFF3FE2FCEFF1B67DA9','ARCHIVED','2023-05-19 18:40:42',0), -('2023_06_14_00_characters.sql','0595B21DCFC0A04F2D8DF1F7BC018C758895DBE5','ARCHIVED','2023-06-14 19:34:24',0); +('2023_06_14_00_characters.sql','0595B21DCFC0A04F2D8DF1F7BC018C758895DBE5','ARCHIVED','2023-06-14 19:34:24',0), +('2023_09_10_00_characters.sql','5DE09CA31B5168CF3622CB462816B6C598893D96','RELEASED','2023-09-10 12:23:34',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/characters/master/2023_05_19_00_characters.sql b/sql/updates/characters/3.3.5/2023_05_19_00_characters.sql similarity index 100% rename from sql/updates/characters/master/2023_05_19_00_characters.sql rename to sql/updates/characters/3.3.5/2023_05_19_00_characters.sql diff --git a/sql/updates/characters/3.3.5/2023_09_10_00_characters.sql b/sql/updates/characters/3.3.5/2023_09_10_00_characters.sql new file mode 100644 index 0000000000000..32fc15f8809d6 --- /dev/null +++ b/sql/updates/characters/3.3.5/2023_09_10_00_characters.sql @@ -0,0 +1 @@ +ALTER TABLE `reserved_name` MODIFY `name` VARCHAR(12) NOT NULL COLLATE utf8mb4_bin; diff --git a/sql/updates/world/3.3.5/2023_09_10_00_world.sql b/sql/updates/world/3.3.5/2023_09_10_00_world.sql new file mode 100644 index 0000000000000..ea7d74116e544 --- /dev/null +++ b/sql/updates/world/3.3.5/2023_09_10_00_world.sql @@ -0,0 +1,28 @@ +-- Spawnpoint for the Invisible bunny NPC +DELETE FROM `creature` WHERE `guid`=202603 AND `id`=35015; +INSERT INTO `creature` (`guid`,`id`,`map`,`zoneId`,`areaId`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`wander_distance`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`,`ScriptName`,`VerifiedBuild`) VALUES +(202603,35015,624,0,0,3,1,0,0,-178.141,77.8142,104.263,0,604800,0,0,1,0,2,0,0,0,'',0); + +DELETE FROM `creature_addon` WHERE `guid`=202603; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`MountCreatureID`,`StandState`,`AnimTier`,`VisFlags`,`SheathState`,`PvPFlags`,`emote`,`visibilityDistanceType`,`auras`) VALUES +(202603,2026030,0,0,0,3,0,1,0,0,0,NULL); + +DELETE FROM `creature_template_movement` WHERE `CreatureId`=35015; +INSERT INTO `creature_template_movement` (`CreatureId`,`Ground`,`Swim`,`Flight`,`Rooted`,`Chase`,`Random`,`InteractionPauseTimer`) VALUES +(35015,NULL,NULL,1,NULL,NULL,NULL,NULL); + +-- Insert Waypoints for the Invisible bunny NPC +DELETE FROM `waypoint_data` WHERE `id`=2026030; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(2026030,1,-178.141,77.8142,104.263,NULL,0,1,0,100,0), +(2026030,2,-177.576,82.8194,103.754,NULL,0,1,0,100,0), +(2026030,3,-196.210,116.535,103.922,NULL,0,1,0,100,0), +(2026030,4,-238.688,118.052,104.146,NULL,0,1,0,100,0), +(2026030,5,-259.618,81.6076,104.146,NULL,0,1,0,100,0), +(2026030,6,-239.828,46.4965,104.146,NULL,0,1,0,100,0), +(2026030,7,-197.300,46.5660,104.263,NULL,0,1,0,100,0); + +-- Change the target to the Koralon Stalker +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=66665; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `Comment`) VALUES +(13,1,66665,0,0,31,0,3,35015,0,0,'Burning Breath: target Burning Breath Koralon Stalker'); diff --git a/sql/updates/world/3.3.5/2023_09_10_01_world.sql b/sql/updates/world/3.3.5/2023_09_10_01_world.sql new file mode 100644 index 0000000000000..93f5978ae6fcf --- /dev/null +++ b/sql/updates/world/3.3.5/2023_09_10_01_world.sql @@ -0,0 +1,4 @@ +-- Change the target to the Koralon Stalker +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=67328; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `Comment`) VALUES +(13,1,67328,0,0,31,0,3,35015,0,0,'Burning Breath: target Burning Breath Koralon Stalker'); diff --git a/src/common/Utilities/StartProcess.cpp b/src/common/Utilities/StartProcess.cpp index dc4fc4e764645..5b4071c9eefbd 100644 --- a/src/common/Utilities/StartProcess.cpp +++ b/src/common/Utilities/StartProcess.cpp @@ -82,8 +82,23 @@ static int CreateChildProcess(T waiter, std::string const& executable, std::string const& logger, std::string const& input, bool secure) { +#if TRINITY_COMPILER == TRINITY_COMPILER_MICROSOFT +#pragma warning(push) +#pragma warning(disable:4297) +/* + Silence warning with boost 1.83 + + boost/process/pipe.hpp(132,5): warning C4297: 'boost::process::basic_pipebuf>::~basic_pipebuf': function assumed not to throw an exception but does + boost/process/pipe.hpp(132,5): message : destructor or deallocator has a (possibly implicit) non-throwing exception specification + boost/process/pipe.hpp(124,6): message : while compiling class template member function 'boost::process::basic_pipebuf>::~basic_pipebuf(void)' + boost/process/pipe.hpp(304,42): message : see reference to class template instantiation 'boost::process::basic_pipebuf>' being compiled +*/ +#endif ipstream outStream; ipstream errStream; +#if TRINITY_COMPILER == TRINITY_COMPILER_MICROSOFT +#pragma warning(pop) +#endif if (!secure) {