diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-25 19:51:27 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-25 19:51:27 +0200 |
| commit | 50cf908d787b8a0d84c95fcc681fc07189a3025e (patch) | |
| tree | c7577a341f27b4208b1b3c151e3869606767a72d /sql/base | |
| parent | f0c366141b4e8fa9c36f4aa4b1050efa06659347 (diff) | |
| parent | a7a9f44cf535cedabd5df369c3cb063626ed0b64 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/World/World.h
Diffstat (limited to 'sql/base')
| -rw-r--r-- | sql/base/auth_database.sql | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index f1a1a71d6ea..ba208bb61c0 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -1,8 +1,8 @@ --- MySQL dump 10.15 Distrib 10.0.10-MariaDB, for Win64 (x86) +-- MySQL dump 10.15 Distrib 10.0.12-MariaDB, for Win64 (x86) -- -- Host: localhost Database: auth_4x -- ------------------------------------------------------ --- Server version 10.0.10-MariaDB +-- Server version 10.0.12-MariaDB /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -391,17 +391,17 @@ 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 + `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 COMMENT 'Notes inserted by system', + `unixtime` int(10) unsigned NOT NULL COMMENT 'Unixtime', + `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Timestamp', + `comment` text COMMENT 'Allows users to add a comment', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Used to log ips of individual actions'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -616,4 +616,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2014-04-28 13:43:54 +-- Dump completed on 2014-06-25 18:37:31 |