Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4
Conflicts: .travis.yml cmake/macros/ConfigureBoost.cmake sql/base/auth_database.sql sql/base/characters_database.sql sql/base/dev/world_database.sql sql/updates/world/2015_03_21_00_world.sql src/server/game/Miscellaneous/Language.h src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellInfo.cpp src/server/scripts/Spells/spell_quest.cpp src/server/worldserver/Main.cpp
This commit is contained in:
commit
fd0ef7bfab
402 files changed
+2494
-366
No files matched your search
+1
-1
@@ -12,7 +12,7 @@ before_install:
|
||||
- sudo apt-get -qq update
|
||||
- sudo apt-get -qq install build-essential libtool gcc-4.8 g++-4.8 make cmake openssl
|
||||
- sudo apt-get -qq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libzmq3-dev
|
||||
- sudo apt-get -qq install libboost1.55-dev libboost-thread1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev
|
||||
- sudo apt-get -qq install libboost1.55-dev libboost-thread1.55-dev libboost-filesystem1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev libboost-iostreams1.55-dev
|
||||
|
||||
install:
|
||||
- mysql -uroot -e 'create database test_mysql;'
|
||||
|
||||
@@ -25,11 +25,36 @@ if(WIN32)
|
||||
add_definitions(-D_WIN32_WINNT=${ver})
|
||||
endif()
|
||||
|
||||
find_package(Boost 1.49 REQUIRED system thread program_options)
|
||||
find_package(Boost 1.49 REQUIRED system filesystem thread program_options iostreams)
|
||||
add_definitions(-DBOOST_DATE_TIME_NO_LIB)
|
||||
add_definitions(-DBOOST_REGEX_NO_LIB)
|
||||
add_definitions(-DBOOST_CHRONO_NO_LIB)
|
||||
|
||||
# Find if Boost was compiled in C++03 mode because it requires -DBOOST_NO_CXX11_SCOPED_ENUMS
|
||||
|
||||
include (CheckCXXSourceCompiles)
|
||||
|
||||
set(CMAKE_REQUIRED_INCLUDES ${Boost_INCLUDE_DIR})
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_IOSTREAMS_LIBRARY})
|
||||
set(CMAKE_REQUIRED_FLAGS "-std=c++11")
|
||||
unset(boost_filesystem_copy_links_without_NO_SCOPED_ENUM CACHE)
|
||||
check_cxx_source_compiles("
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
int main() { boost::filesystem::copy_file(boost::filesystem::path(), boost::filesystem::path()); }"
|
||||
boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
|
||||
unset(CMAKE_REQUIRED_INCLUDES CACHE)
|
||||
unset(CMAKE_REQUIRED_LIBRARIES CACHE)
|
||||
unset(CMAKE_REQUIRED_FLAGS CACHE)
|
||||
|
||||
if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
|
||||
if (Boost_VERSION LESS 105100) # 1.51
|
||||
add_definitions(-DBOOST_NO_SCOPED_ENUMS)
|
||||
else()
|
||||
add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(Boost_FOUND)
|
||||
include_directories(${Boost_INCLUDE_DIRS})
|
||||
endif()
|
||||
@@ -5,6 +5,7 @@
|
||||
# This module defines
|
||||
# MYSQL_INCLUDE_DIR, where to find mysql.h
|
||||
# MYSQL_LIBRARIES, the libraries to link against to connect to MySQL
|
||||
# MYSQL_EXECUTABLE, the MySQL executable.
|
||||
# MYSQL_FOUND, if false, you cannot build anything that requires MySQL.
|
||||
|
||||
# also defined, but not for general use are
|
||||
@@ -182,6 +183,65 @@ else( NOT WIN32 )
|
||||
set( MYSQL_EXTRA_LIBRARIES "" )
|
||||
endif( NOT WIN32 )
|
||||
|
||||
if( UNIX )
|
||||
find_program(MYSQL_EXECUTABLE mysql
|
||||
PATHS
|
||||
${MYSQL_CONFIG_PREFER_PATH}
|
||||
/usr/local/mysql/bin/
|
||||
/usr/local/bin/
|
||||
/usr/bin/
|
||||
DOC
|
||||
"path to your mysql binary."
|
||||
)
|
||||
endif( UNIX )
|
||||
|
||||
if( WIN32 )
|
||||
find_program(MYSQL_EXECUTABLE mysql
|
||||
PATHS
|
||||
"C:/Program Files/MySQL/MySQL Server 5.6/bin"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.6/bin/opt"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.5/bin"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.5/bin/opt"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.1/bin"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.1/bin/opt"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.0/bin"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.0/bin/opt"
|
||||
"C:/Program Files/MySQL/bin"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.6/bin"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.6/bin/opt"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.5/bin"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.5/bin/opt"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.1/bin"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.1/bin/opt"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.0/bin"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.0/bin/opt"
|
||||
"C:/Program Files (x86)/MySQL/bin"
|
||||
"C:/MySQL/bin/debug"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/bin/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/bin/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/bin/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/bin/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/bin/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/bin/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/bin/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/bin/opt"
|
||||
"$ENV{ProgramFiles}/MySQL/*/bin/opt"
|
||||
"$ENV{SystemDrive}/MySQL/*/bin/opt"
|
||||
"c:/msys/local/include"
|
||||
"$ENV{MYSQL_ROOT}/bin"
|
||||
DOC
|
||||
"path to your mysql binary."
|
||||
)
|
||||
endif( WIN32 )
|
||||
|
||||
if( MYSQL_LIBRARY )
|
||||
if( MYSQL_INCLUDE_DIR )
|
||||
set( MYSQL_FOUND 1 )
|
||||
@@ -190,7 +250,10 @@ if( MYSQL_LIBRARY )
|
||||
else( MYSQL_INCLUDE_DIR )
|
||||
message(FATAL_ERROR "Could not find MySQL headers! Please install the development libraries and headers")
|
||||
endif( MYSQL_INCLUDE_DIR )
|
||||
mark_as_advanced( MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIR )
|
||||
if( MYSQL_EXECUTABLE )
|
||||
message(STATUS "Found MySQL executable: ${MYSQL_EXECUTABLE}")
|
||||
endif( MYSQL_EXECUTABLE )
|
||||
mark_as_advanced( MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIR MYSQL_EXECUTABLE)
|
||||
else( MYSQL_LIBRARY )
|
||||
message(FATAL_ERROR "Could not find the MySQL libraries! Please install the development libraries and headers")
|
||||
endif( MYSQL_LIBRARY )
|
||||
@@ -4,6 +4,10 @@ Boost
|
||||
http://www.boost.org
|
||||
Version: 1.55
|
||||
|
||||
Boost Process (Proposed for boost, but its not an official part of it yet. Used to start child processes.)
|
||||
http://www.highscore.de/boost/process0.5/
|
||||
Version: 0.5
|
||||
|
||||
bzip2 (a freely available, patent free, high-quality data compressor)
|
||||
http://www.bzip.org/
|
||||
Version: 1.0.6
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
#define _HASH "@rev_hash@"
|
||||
#define _DATE "@rev_date@"
|
||||
#define _BRANCH "@rev_branch@"
|
||||
#define _SOURCE_DIRECTORY "@CMAKE_SOURCE_DIR@"
|
||||
#define _MYSQL_EXECUTABLE "@MYSQL_EXECUTABLE@"
|
||||
#define _FULL_DATABASE "TDB_full_335.58_2015_03_21.sql"
|
||||
#define VER_COMPANYNAME_STR "TrinityCore Developers"
|
||||
#define VER_LEGALCOPYRIGHT_STR "(c)2008-2015 TrinityCore"
|
||||
#define VER_FILEVERSION 0,0,0
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
-- MySQL dump 10.15 Distrib 10.0.15-MariaDB, for Win64 (x86)
|
||||
-- MySQL dump 10.13 Distrib 5.6.9-rc, for Win64 (x86_64)
|
||||
--
|
||||
-- Host: localhost Database: auth_4x
|
||||
-- ------------------------------------------------------
|
||||
-- Server version 10.0.15-MariaDB
|
||||
-- Server version 5.6.9-rc
|
||||
|
||||
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
||||
@@ -509,7 +509,7 @@ CREATE TABLE `rbac_default_permissions` (
|
||||
|
||||
LOCK TABLES `rbac_default_permissions` WRITE;
|
||||
/*!40000 ALTER TABLE `rbac_default_permissions` DISABLE KEYS */;
|
||||
INSERT INTO `rbac_default_permissions` VALUES (0,195,-1),(1,194,-1),(2,193,-1),(3,192,-1);
|
||||
INSERT INTO `rbac_default_permissions` VALUES (3,192,-1),(2,193,-1),(1,194,-1),(0,195,-1);
|
||||
/*!40000 ALTER TABLE `rbac_default_permissions` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
@@ -627,6 +627,57 @@ INSERT INTO `realmlist` VALUES (1,'Trinity','127.0.0.1','127.0.0.1','255.255.255
|
||||
/*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `updates`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `updates`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `updates` (
|
||||
`name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
|
||||
`hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
|
||||
`state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
|
||||
`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
|
||||
`speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
|
||||
PRIMARY KEY (`name`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `updates`
|
||||
--
|
||||
|
||||
LOCK TABLES `updates` WRITE;
|
||||
/*!40000 ALTER TABLE `updates` DISABLE KEYS */;
|
||||
INSERT INTO `updates` VALUES ('2014_11_10_00_auth.sql','0E3CB119442D09DD88E967015319BBC8DAFBBFE0','ARCHIVED','2015-03-21 21:44:12',0),('2014_11_10_01_auth.sql','327E77A1DA3546D5275AB249915DD57EDD6FDD3D','ARCHIVED','2015-03-21 21:44:12',0),('2014_12_10_00_auth.sql','821703A96D80F9080074852B5A46E2909C9562EA','ARCHIVED','2015-03-21 21:44:12',0),('2014_12_21_00_auth.sql','CE2E5D2CD82E79C25294539ADED27A1429105B43','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_00_auth.sql','E8C5B74BB45F0F35DEC182C72BACF435C7066FB0','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_01_auth.sql','862961815354DA2746F5F71FBC8155F57CBE75AB','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_02_auth.sql','33E4F94086590768EF5D4855DD43D7DE7C06ADA4','ARCHIVED','2015-03-21 21:44:51',0);
|
||||
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `updates_include`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `updates_include`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `updates_include` (
|
||||
`path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
|
||||
`state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
|
||||
PRIMARY KEY (`path`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `updates_include`
|
||||
--
|
||||
|
||||
LOCK TABLES `updates_include` WRITE;
|
||||
/*!40000 ALTER TABLE `updates_include` DISABLE KEYS */;
|
||||
INSERT INTO `updates_include` VALUES ('$/sql/updates/auth','RELEASED'),('$/sql/custom/auth','RELEASED'),('$/sql/old/3.3.5a/auth','ARCHIVED');
|
||||
/*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `uptime`
|
||||
--
|
||||
@@ -662,4 +713,4 @@ UNLOCK TABLES;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
|
||||
-- Dump completed on 2014-12-21 20:42:33
|
||||
-- Dump completed on 2015-03-21 21:48:22
|
||||
@@ -1,8 +1,8 @@
|
||||
-- MySQL dump 10.13 Distrib 5.5.40, for debian-linux-gnu (x86_64)
|
||||
-- MySQL dump 10.13 Distrib 5.6.9-rc, for Win64 (x86_64)
|
||||
--
|
||||
-- Host: localhost Database: characters_4x
|
||||
-- ------------------------------------------------------
|
||||
-- Server version 5.5.40-0ubuntu0.14.04.1
|
||||
-- Server version 5.6.9-rc
|
||||
|
||||
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
||||
@@ -2738,6 +2738,57 @@ LOCK TABLES `reserved_name` WRITE;
|
||||
/*!40000 ALTER TABLE `reserved_name` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `updates`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `updates`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `updates` (
|
||||
`name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
|
||||
`hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
|
||||
`state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
|
||||
`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
|
||||
`speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
|
||||
PRIMARY KEY (`name`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `updates`
|
||||
--
|
||||
|
||||
LOCK TABLES `updates` WRITE;
|
||||
/*!40000 ALTER TABLE `updates` DISABLE KEYS */;
|
||||
INSERT INTO `updates` VALUES ('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_01_characters.sql','894F08B70449A5481FFAF394EE5571D7FC4D8A3A','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_02_characters.sql','97D7BE0CAADC79F3F11B9FD296B8C6CD40FE593B','ARCHIVED','2015-03-21 21:44:51',0);
|
||||
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `updates_include`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `updates_include`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `updates_include` (
|
||||
`path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
|
||||
`state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
|
||||
PRIMARY KEY (`path`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `updates_include`
|
||||
--
|
||||
|
||||
LOCK TABLES `updates_include` WRITE;
|
||||
/*!40000 ALTER TABLE `updates_include` DISABLE KEYS */;
|
||||
INSERT INTO `updates_include` VALUES ('$/sql/updates/characters','RELEASED'),('$/sql/custom/characters','RELEASED'),('$/sql/old/3.3.5a/characters','ARCHIVED');
|
||||
/*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `warden_action`
|
||||
--
|
||||
@@ -2795,4 +2846,4 @@ UNLOCK TABLES;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
|
||||
-- Dump completed on 2014-10-18 18:02:06
|
||||
-- Dump completed on 2015-03-21 21:48:11
|
||||
@@ -3715,6 +3715,37 @@ CREATE TABLE `trinity_string` (
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Table structure for table `updates`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `updates`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `updates` (
|
||||
`name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
|
||||
`hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
|
||||
`state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
|
||||
`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
|
||||
`speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
|
||||
PRIMARY KEY (`name`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Table structure for table `updates_include`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `updates_include`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `updates_include` (
|
||||
`path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
|
||||
`state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
|
||||
PRIMARY KEY (`path`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Table structure for table `vehicle_accessory`
|
||||
--
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
*.sql
|
||||
@@ -0,0 +1 @@
|
||||
*.sql
|
||||
@@ -0,0 +1 @@
|
||||
*.sql
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,36 @@
|
||||
-- Updates base tables
|
||||
DROP TABLE IF EXISTS `updates`;
|
||||
CREATE TABLE `updates` (
|
||||
`name` VARCHAR(200) NOT NULL COMMENT 'filename with extension of the update.',
|
||||
`hash` CHAR(40) NULL DEFAULT '' COMMENT 'sha1 hash of the sql file.',
|
||||
`state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
|
||||
`timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
|
||||
`speed` INT(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'time the query takes to apply in ms.',
|
||||
PRIMARY KEY (`name`)
|
||||
)
|
||||
COMMENT='List of all applied updates in this database.'
|
||||
COLLATE='utf8_general_ci'
|
||||
ENGINE=MyISAM;
|
||||
|
||||
DROP TABLE IF EXISTS `updates_include`;
|
||||
CREATE TABLE `updates_include` (
|
||||
`path` VARCHAR(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
|
||||
`state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
|
||||
PRIMARY KEY (`path`)
|
||||
)
|
||||
COMMENT='List of directories where we want to include sql updates.'
|
||||
COLLATE='utf8_general_ci'
|
||||
ENGINE=MyISAM;
|
||||
|
||||
-- Auth database update data
|
||||
TRUNCATE TABLE `updates_include`;
|
||||
INSERT INTO `updates_include` (`path`, `state`) VALUES
|
||||
('$/sql/updates/auth', 'RELEASED'),
|
||||
('$/sql/custom/auth', 'RELEASED'),
|
||||
('$/sql/old/3.3.5a/auth', 'ARCHIVED');
|
||||
|
||||
INSERT IGNORE INTO `updates` (`name`, `hash`) VALUES
|
||||
('2015_03_20_00_auth.sql', ''),
|
||||
('2015_03_20_01_auth.sql', ''),
|
||||
('2015_03_20_02_auth.sql', '');
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
-- Auth database update data
|
||||
TRUNCATE TABLE `updates_include`;
|
||||
INSERT INTO `updates_include` (`path`, `state`) VALUES
|
||||
('$/sql/updates/auth', 'RELEASED'),
|
||||
('$/sql/custom/auth', 'RELEASED'),
|
||||
('$/sql/old/3.3.5a/auth', 'ARCHIVED');
|
||||
@@ -0,0 +1,8 @@
|
||||
INSERT IGNORE INTO `updates` (`name`, `hash`) VALUES
|
||||
('2014_11_10_00_auth.sql', '0E3CB119442D09DD88E967015319BBC8DAFBBFE0'),
|
||||
('2014_11_10_01_auth.sql', '327E77A1DA3546D5275AB249915DD57EDD6FDD3D'),
|
||||
('2014_12_10_00_auth.sql', '821703A96D80F9080074852B5A46E2909C9562EA'),
|
||||
('2014_12_21_00_auth.sql', 'CE2E5D2CD82E79C25294539ADED27A1429105B43'),
|
||||
('2015_03_20_00_auth.sql', 'E8C5B74BB45F0F35DEC182C72BACF435C7066FB0'),
|
||||
('2015_03_20_01_auth.sql', '862961815354DA2746F5F71FBC8155F57CBE75AB'),
|
||||
('2015_03_20_02_auth.sql', '');
|
||||
@@ -0,0 +1,23 @@
|
||||
-- Updates base tables
|
||||
DROP TABLE IF EXISTS `updates`;
|
||||
CREATE TABLE `updates` (
|
||||
`name` VARCHAR(200) NOT NULL COMMENT 'filename with extension of the update.',
|
||||
`hash` CHAR(40) NULL DEFAULT '' COMMENT 'sha1 hash of the sql file.',
|
||||
`state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
|
||||
`timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
|
||||
`speed` INT(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'time the query takes to apply in ms.',
|
||||
PRIMARY KEY (`name`)
|
||||
)
|
||||
COMMENT='List of all applied updates in this database.'
|
||||
COLLATE='utf8_general_ci'
|
||||
ENGINE=MyISAM;
|
||||
|
||||
DROP TABLE IF EXISTS `updates_include`;
|
||||
CREATE TABLE `updates_include` (
|
||||
`path` VARCHAR(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
|
||||
`state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
|
||||
PRIMARY KEY (`path`)
|
||||
)
|
||||
COMMENT='List of directories where we want to include sql updates.'
|
||||
COLLATE='utf8_general_ci'
|
||||
ENGINE=MyISAM;
|
||||
@@ -0,0 +1,6 @@
|
||||
-- Characters database update data
|
||||
TRUNCATE TABLE `updates_include`;
|
||||
INSERT INTO `updates_include` (`path`, `state`) VALUES
|
||||
('$/sql/updates/characters', 'RELEASED'),
|
||||
('$/sql/custom/characters', 'RELEASED'),
|
||||
('$/sql/old/3.3.5a/characters', 'ARCHIVED');
|
||||
@@ -0,0 +1,4 @@
|
||||
INSERT IGNORE INTO `updates` (`name`, `hash`) VALUES
|
||||
('2015_03_20_00_characters.sql', 'B761760804EA73BD297F296C5C1919687DF7191C'),
|
||||
('2015_03_20_01_characters.sql', '894F08B70449A5481FFAF394EE5571D7FC4D8A3A'),
|
||||
('2015_03_20_02_characters.sql', '');
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 100 of 402 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user