diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-23 23:47:48 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-23 23:47:48 +0200 |
| commit | d8234bed420728aaa2e0f329778730a906f7dd12 (patch) | |
| tree | be30b4b452967bed923c106971c35014ab4c9412 /sql/base | |
| parent | 9bac986f35067941552b7dec8da81eac127d2f66 (diff) | |
| parent | aa93a975469cca56e35adc1b5b501f4536be61f1 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Accounts/AccountMgr.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Server/WorldSocket.cpp
src/server/game/World/World.cpp
Diffstat (limited to 'sql/base')
| -rw-r--r-- | sql/base/auth_database.sql | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index a76281da729..f1a1a71d6ea 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -34,6 +34,7 @@ CREATE TABLE `account` ( `reg_mail` varchar(255) NOT NULL DEFAULT '', `joindate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `last_ip` varchar(15) NOT NULL DEFAULT '127.0.0.1', + `last_attempt_ip` varchar(15) NOT NULL DEFAULT '127.0.0.1', `failed_logins` int(10) unsigned NOT NULL DEFAULT '0', `locked` tinyint(3) unsigned NOT NULL DEFAULT '0', `lock_country` varchar(2) NOT NULL DEFAULT '00', @@ -383,6 +384,36 @@ LOCK TABLES `logs` WRITE; UNLOCK TABLES; -- +-- Table structure for table `logs_ip_actions` +-- + +DROP TABLE IF EXISTS `logs_ip_actions`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `logs_ip_actions` ( +`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Unique Identifier', +`account_id` INT(10) UNSIGNED NOT NULL COMMENT 'Account ID', +`character_guid` INT(10) UNSIGNED NOT NULL COMMENT 'Character Guid', +`type` TINYINT(3) UNSIGNED NOT NULL, +`ip` VARCHAR(15) NOT NULL DEFAULT '127.0.0.1', +`systemnote` TEXT NULL COMMENT 'Notes inserted by system', +`unixtime` INT(10) UNSIGNED NOT NULL COMMENT 'Unixtime', +`time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Timestamp', +`comment` TEXT NULL COMMENT 'Allows users to add a comment', +PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `logs_ip_actions` +-- + +LOCK TABLES `logs_ip_actions` WRITE; +/*!40000 ALTER TABLE `logs_ip_actions` DISABLE KEYS */; +/*!40000 ALTER TABLE `logs_ip_actions` ENABLE KEYS */; +UNLOCK TABLES; + +-- -- Table structure for table `rbac_account_permissions` -- |
