pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

Browse Source 
Conflicts:
	zone/command.cpp
	zone/command.h
	zone/inventory.cpp
This commit is contained in:
Akkadius
2015-01-21 16:40:46 -06:00
parent a59138d2d9 bd4e15609a
commit 3d74035e24
37 changed files with 6196 additions and 3324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/sql/git/bots/deprecated/load_bots_old.sql
+2 -2
View File
@@ -194,7 +194,7 @@ CREATE TABLE `botguildmembers` (
PRIMARY KEY (`char_id`)
) ENGINE=InnoDB;
DELIMITER //
DELIMITER $$
CREATE FUNCTION `GetMobType` (mobname VARCHAR(64)) RETURNS CHAR(1)
BEGIN
@@ -209,7 +209,7 @@ BEGIN
END IF;
RETURN Result;
END//
END$$
DELIMITER ;
utils/sql/git/bots/load_bots.sql
+2 -2
View File
@@ -194,7 +194,7 @@ CREATE TABLE `botguildmembers` (
PRIMARY KEY (`char_id`)
) ENGINE=InnoDB;
DELIMITER \\
DELIMITER $$
CREATE FUNCTION `GetMobType` (mobname VARCHAR(64)) RETURNS CHAR(1)
BEGIN
@@ -209,7 +209,7 @@ BEGIN
END IF;
RETURN Result;
END\\
END$$
DELIMITER ;