Merge branch '1.x' of https://github.com/azerothcore/azerothcore-wotlk into 1.x

updated doc submodule
DB/Auth: fix column name in update file, thanks @DarkmoonRabbit
2016-12-29 21:03:34 +01:00 · 2016-12-29 21:02:55 +01:00 · 2016-11-21 19:33:58 +01:00 · 2016-11-20 17:17:13 +01:00
3 changed files with 3 additions and 3 deletions
@@ -13,7 +13,7 @@ INSERT INTO version_db_auth (`sql_rev`) VALUES ('1478975214169487000');
 ALTER TABLE `account`
    ADD `token_key` VARCHAR(100) NOT NULL DEFAULT '' AFTER `s`,
-    ADD `reg_mail` VARCHAR(255) NOT NULL DEFAULT '' AFTER `mail`,
+    ADD `reg_mail` VARCHAR(255) NOT NULL DEFAULT '' AFTER `email`,
    ADD `last_attempt_ip` VARCHAR(15) NOT NULL DEFAULT '127.0.0.1' AFTER `last_ip`,
    ADD `lock_country` VARCHAR(2) NOT NULL DEFAULT '00' AFTER `locked`;
 --
@@ -11,7 +11,7 @@ SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '147723682367413000
 --
 INSERT INTO version_db_world(`sql_rev`) VALUES ('1477236823674130000');
-UPDATE `quest_template` SET `SpecialFlags` = "0", `RequiredItemId1` = "31811", `RequiredItemCount1` ="1", `Flags` = "0" WHERE `ID` = "10923"
+UPDATE `quest_template` SET `SpecialFlags` = "0", `RequiredItemId1` = "31811", `RequiredItemCount1` ="1", `Flags` = "0" WHERE `ID` = "10923";
 --
 -- END UPDATING QUERIES
 --
Author	SHA1	Message	Date
Yehonal	ffd81423f8	Merge branch '1.x' of https://github.com/azerothcore/azerothcore-wotlk into 1.x	2016-12-29 21:03:34 +01:00
Yehonal	d3804b6d56	updated doc submodule	2016-12-29 21:02:55 +01:00
ShinDarth	988790892d	DB/Auth: fix column name in update file, thanks @DarkmoonRabbit	2016-11-21 19:33:58 +01:00
ShinDarth	ef49439b55	DB/Updates: fix syntax error in SQL update file	2016-11-20 17:17:13 +01:00