*Merge some fixes from tc1

--HG--
branch : trunk

Makefile.am

@@ -31,8 +31,7 @@ EXTRA_DIST = \
 	win/VC71/realmd.vcproj \
 	win/VC71/shared.vcproj \
 	win/VC71/zlib.vcproj \
-	win/VC71/g3dlite.vcproj \
-	win/VC71/zthread.vcproj
+	win/VC71/g3dlite.vcproj
 
 # Win32 project workspace for Visual Studio .NET 2005
 EXTRA_DIST += \
@@ -43,8 +42,7 @@ EXTRA_DIST += \
 	win/VC80/realmd.vcproj \
 	win/VC80/shared.vcproj \
 	win/VC80/zlib.vcproj \
-	win/VC80/g3dlite.vcproj \
-	win/VC80/zthread.vcproj
+	win/VC80/g3dlite.vcproj
 
 # Win32 project workspace for Visual Studio .NET 2008
 EXTRA_DIST += \
@@ -55,6 +53,5 @@ EXTRA_DIST += \
 	win/VC90/realmd.vcproj \
 	win/VC90/shared.vcproj \
 	win/VC90/zlib.vcproj \
-	win/VC90/g3dlite.vcproj \
-	win/VC90/zthread.vcproj
+	win/VC90/g3dlite.vcproj
 

configure.ac

@@ -340,7 +340,6 @@ AC_CONFIG_FILES([
    dep/src/g3dlite/Makefile
    dep/src/sockets/Makefile
    dep/src/zlib/Makefile
-   dep/src/zthread/Makefile
    dep/Makefile
    doc/Doxyfile
    doc/Makefile

dep/ACE_wrappers/m4/aio.m4

@@ -64,7 +64,6 @@ if test "$ace_has_aio_funcs" = yes; then
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
-#include <iostream.h>
 
 #include <aio.h>
 

dep/include/Makefile.am

@@ -199,54 +199,6 @@ EXTRA_DIST += \
 	zlib/zconf.h \
 	zlib/zlib.h
 
-#  ZThread header files for Win32 builds
-EXTRA_DIST += \
-	zthread/AtomicCount.h \
-	zthread/Barrier.h \
-	zthread/BiasedReadWriteLock.h \
-	zthread/BlockingQueue.h \
-	zthread/BoundedQueue.h \
-	zthread/Cancelable.h \
-	zthread/ClassLockable.h \
-	zthread/ConcurrentExecutor.h \
-	zthread/Condition.h \
-	zthread/Config.h \
-	zthread/CountedPtr.h \
-	zthread/CountingSemaphore.h \
-	zthread/Exceptions.h \
-	zthread/Executor.h \
-	zthread/FairReadWriteLock.h \
-	zthread/FastMutex.h \
-	zthread/FastRecursiveMutex.h \
-	zthread/Guard.h \
-	zthread/GuardedClass.h \
-	zthread/Lockable.h \
-	zthread/LockedQueue.h \
-	zthread/MonitoredQueue.h \
-	zthread/Mutex.h \
-	zthread/NonCopyable.h \
-	zthread/PoolExecutor.h \
-	zthread/Priority.h \
-	zthread/PriorityCondition.h \
-	zthread/PriorityInheritanceMutex.h \
-	zthread/PriorityMutex.h \
-	zthread/PrioritySemaphore.h \
-	zthread/Queue.h \
-	zthread/ReadWriteLock.h \
-	zthread/RecursiveMutex.h \
-	zthread/Runnable.h \
-	zthread/Semaphore.h \
-	zthread/Singleton.h \
-	zthread/SynchronousExecutor.h \
-	zthread/Task.h \
-	zthread/Thread.h \
-	zthread/ThreadLocal.h \
-	zthread/ThreadLocalImpl.h \
-	zthread/ThreadedExecutor.h \
-	zthread/Time.h \
-	zthread/Waitable.h \
-	zthread/ZThread.h
-
 # Mersenne Twister random number generator header files
 EXTRA_DIST += \
 	mersennetwister/MersenneTwister.h

dep/include/openssl/asn1.h

@@ -612,6 +612,7 @@ typedef struct BIT_STRING_BITNAME_st {
 			B_ASN1_GENERALIZEDTIME
 
 #define B_ASN1_PRINTABLE \
+			B_ASN1_NUMERICSTRING| \
 			B_ASN1_PRINTABLESTRING| \
 			B_ASN1_T61STRING| \
 			B_ASN1_IA5STRING| \
@@ -1217,6 +1218,7 @@ void ERR_load_ASN1_strings(void);
 #define ASN1_R_BAD_OBJECT_HEADER			 102
 #define ASN1_R_BAD_PASSWORD_READ			 103
 #define ASN1_R_BAD_TAG					 104
+#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH		 210
 #define ASN1_R_BN_LIB					 105
 #define ASN1_R_BOOLEAN_IS_WRONG_LENGTH			 106
 #define ASN1_R_BUFFER_TOO_SMALL				 107
@@ -1306,6 +1308,7 @@ void ERR_load_ASN1_strings(void);
 #define ASN1_R_UNABLE_TO_DECODE_RSA_KEY			 157
 #define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY		 158
 #define ASN1_R_UNEXPECTED_EOC				 159
+#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH		 211
 #define ASN1_R_UNKNOWN_FORMAT				 160
 #define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM		 161
 #define ASN1_R_UNKNOWN_OBJECT_TYPE			 162

dep/include/openssl/opensslconf.h

@@ -104,8 +104,8 @@
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "G:\openssl_build/lib/engines"
-#define OPENSSLDIR "G:\openssl_build/ssl"
+#define ENGINESDIR "g:/openssl/lib/engines"
+#define OPENSSLDIR "g:/openssl/ssl"
 #endif
 #endif
 

dep/include/openssl/opensslv.h

@@ -25,11 +25,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x009080afL
+#define OPENSSL_VERSION_NUMBER	0x009080bfL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8j-fips 07 Jan 2009"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8k-fips 25 Mar 2009"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8j 07 Jan 2009"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8k 25 Mar 2009"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 

dep/include/openssl/pem.h

@@ -215,7 +215,9 @@ typedef struct pem_ctx_st
 
 #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/
 #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/
+#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/
 #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/
+#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/
 
 #else
 
@@ -355,6 +357,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
 
 #define DECLARE_PEM_read_fp(name, type) /**/
 #define DECLARE_PEM_write_fp(name, type) /**/
+#define DECLARE_PEM_write_fp_const(name, type) /**/
 #define DECLARE_PEM_write_cb_fp(name, type) /**/
 
 #else
@@ -392,6 +395,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
 
 #define DECLARE_PEM_read_bio(name, type) /**/
 #define DECLARE_PEM_write_bio(name, type) /**/
+#define DECLARE_PEM_write_bio_const(name, type) /**/
 #define DECLARE_PEM_write_cb_bio(name, type) /**/
 
 #endif

dep/include/openssl/symhacks.h

@@ -62,6 +62,10 @@
    VAX. */
 #ifdef OPENSSL_SYS_VMS
 
+/* Hack a long name in crypto/cryptlib.c */
+#undef int_CRYPTO_set_do_dynlock_callback
+#define int_CRYPTO_set_do_dynlock_callback	int_CRYPTO_set_do_dynlock_cb
+
 /* Hack a long name in crypto/ex_data.c */
 #undef CRYPTO_get_ex_data_implementation
 #define CRYPTO_get_ex_data_implementation	CRYPTO_get_ex_data_impl

dep/src/Makefile.am

@@ -19,7 +19,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Sub-directories to parse
-SUBDIRS = g3dlite sockets zlib zthread
+SUBDIRS = g3dlite sockets zlib
 
 ## Additional files to include when running 'make dist'
 #  Nothing yet.

dep/src/zthread/AtomicCount.cxx

@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2005, Eric Crahen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef __ZTATOMICCOUNTSELECT_H__
-#define __ZTATOMICCOUNTSELECT_H__
-
-#include "zthread/AtomicCount.h"
-#include "zthread/Config.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/*
-// Select the correct AtomicCount implementation based on
-// what the compilation environment has defined
-
-#ifndef ZT_VANILLA
-
-#if defined(HAVE_ATOMIC_LINUX)
-#  include "linux/AtomicCount.cxx"
-#elif defined(ZT_WIN32)
-#  include "win32/AtomicCount.cxx"
-#elif defined(ZT_WIN9X)
-#  include "win9x/AtomicCount.cxx"
-#endif
-
-#endif
-
-// Default to an AtomicCount that just uses a FastLock
-#ifndef __ZTATOMICCOUNTIMPL_H__
-#  include "vanilla/SimpleAtomicCount.cxx"
-#endif
-*/
-
-#  include "vanilla/SimpleAtomicCount.cxx"
-
-#endif // __ZTATOMICCOUNTSELECT_H__

dep/src/zthread/CMakeLists.txt

@@ -1,7 +1,6 @@
 ########### next target ###############
 
 SET(ZThread_LIB_SRCS
-   AtomicCount.cxx
    Condition.cxx
    ConcurrentExecutor.cxx
    CountingSemaphore.cxx

sql/CMakeLists.txt

@@ -6,4 +6,4 @@ add_subdirectory(tools)
 
 FILE(GLOB _SQL *.sql)
 
-install(FILES ${_SQL} DESTINATION share/trinity/sql)
+install(FILES ${_SQL} DESTINATION share/trinity/sql)

sql/TBC-WLK_converter/TBC-WLK_characters.sql

@@ -261,6 +261,12 @@ DELETE FROM `character_spell` WHERE `spell` IN (27354,24513,24512,24511,24494,21
 UPDATE IGNORE character_spell SET spell = 2108 WHERE spell = 3104;
 DELETE FROM character_spell                    WHERE spell = 3104;
 
+/* Remove Mana Tap */
+DELETE FROM `character_action` WHERE `type` = 0 AND `action` = 28734;
+DELETE FROM `character_aura` WHERE `spell` = 28734;
+DELETE FROM `character_spell` WHERE `spell` = 28734;
+DELETE FROM `character_spell_cooldown` WHERE `spell` = 28734;
+
 /* This cleanup character_action. This is like delete from character_action where type=0 and action not in character_spell for same player */
 DELETE FROM ca,cs USING `character_action` ca LEFT JOIN `character_spell` cs ON ca.`guid`=cs.`guid` AND ca.`action`=cs.`spell` WHERE ca.`type`=0 AND cs.`guid` IS NULL;
 

sql/TBC-WLK_converter/TBC-WLK_world.sql

@@ -314,29 +314,25 @@ INSERT IGNORE INTO `playercreateinfo_action` (`race`, `class`, `button`, `action
 (10, 2, 0, 6603, 0, 0),
 (10, 2, 1, 21084, 0, 0),
 (10, 2, 2, 635, 0, 0),
-(10, 2, 3, 28734, 0, 0),
-(10, 2, 4, 28730, 0, 0),
+(10, 2, 3, 28730, 0, 0),
 (10, 2, 10, 159, 128, 0),
 (10, 2, 11, 20857, 128, 0),
 (10, 3, 0, 6603, 0, 0),
 (10, 3, 1, 2973, 0, 0),
 (10, 3, 2, 75, 0, 0),
-(10, 3, 3, 28734, 0, 0),
-(10, 3, 4, 28730, 0, 0),
+(10, 3, 3, 28730, 0, 0),
 (10, 3, 10, 159, 128, 0),
 (10, 3, 11, 20857, 128, 0),
 (10, 4, 0, 6603, 0, 0),
 (10, 4, 1, 1752, 0, 0),
 (10, 4, 2, 2098, 0, 0),
 (10, 4, 3, 2764, 0, 0),
-(10, 4, 4, 28734, 0, 0),
-(10, 4, 5, 25046, 0, 0),
+(10, 4, 4, 25046, 0, 0),
 (10, 4, 11, 20857, 128, 0),
 (10, 5, 0, 6603, 0, 0),
 (10, 5, 1, 585, 0, 0),
 (10, 5, 2, 2050, 0, 0),
-(10, 5, 3, 28734, 0, 0),
-(10, 5, 4, 28730, 0, 0),
+(10, 5, 3, 28730, 0, 0),
 (10, 5, 10, 159, 128, 0),
 (10, 5, 11, 20857, 128, 0),
 (10, 6, 0, 6603, 0, 0),
@@ -349,14 +345,12 @@ INSERT IGNORE INTO `playercreateinfo_action` (`race`, `class`, `button`, `action
 (10, 8, 0, 6603, 0, 0),
 (10, 8, 1, 133, 0, 0),
 (10, 8, 2, 168, 0, 0),
-(10, 8, 3, 28734, 0, 0),
-(10, 8, 4, 28730, 0, 0),
+(10, 8, 3, 28730, 0, 0),
 (10, 8, 10, 159, 128, 0),
 (10, 8, 11, 20857, 128, 0),
 (10, 9, 11, 20857, 128, 0),
 (10, 9, 10, 159, 128, 0),
-(10, 9, 4, 28730, 0, 0),
-(10, 9, 3, 28734, 0, 0),
+(10, 9, 3, 28730, 0, 0),
 (10, 9, 2, 687, 0, 0),
 (10, 9, 1, 686, 0, 0),
 (10, 9, 0, 6603, 0, 0),
@@ -2647,7 +2641,6 @@ INSERT IGNORE INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) V
 (10, 2, 22810, 'Opening - No Text'),
 (10, 2, 27762, 'Libram'),
 (10, 2, 28730, 'Arcane Torrent'),
-(10, 2, 28734, 'Mana Tap'),
 (10, 2, 28877, 'Arcane Affinity'),
 (10, 3, 75, 'Auto Shot'),
 (10, 3, 81, 'Dodge'),
@@ -2684,7 +2677,6 @@ INSERT IGNORE INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) V
 (10, 3, 22810, 'Opening - No Text'),
 (10, 3, 24949, 'Defensive State 2 (DND)'),
 (10, 3, 28730, 'Arcane Torrent'),
-(10, 3, 28734, 'Mana Tap'),
 (10, 3, 28877, 'Arcane Affinity'),
 (10, 3, 34082, 'Advantaged State (DND)'),
 (10, 4, 81, 'Dodge'),
@@ -2723,7 +2715,6 @@ INSERT IGNORE INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) V
 (10, 4, 22027, 'Remove Insignia'),
 (10, 4, 22810, 'Opening - No Text'),
 (10, 4, 25046, 'Arcane Torrent'),
-(10, 4, 28734, 'Mana Tap'),
 (10, 4, 28877, 'Arcane Affinity'),
 (10, 5, 81, 'Dodge'),
 (10, 5, 198, 'One-Handed Maces'),
@@ -2758,7 +2749,6 @@ INSERT IGNORE INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) V
 (10, 5, 22027, 'Remove Insignia'),
 (10, 5, 22810, 'Opening - No Text'),
 (10, 5, 28730, 'Arcane Torrent'),
-(10, 5, 28734, 'Mana Tap'),
 (10, 5, 28877, 'Arcane Affinity'),
 (10, 6, 81, 'Dodge'),
 (10, 6, 196, 'One-Handed Axes'),
@@ -2860,7 +2850,6 @@ INSERT IGNORE INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) V
 (10, 8, 22027, 'Remove Insignia'),
 (10, 8, 22810, 'Opening - No Text'),
 (10, 8, 28730, 'Arcane Torrent'),
-(10, 8, 28734, 'Mana Tap'),
 (10, 8, 28877, 'Arcane Affinity'),
 (10, 9, 81, 'Dodge'),
 (10, 9, 203, 'Unarmed'),
@@ -2895,7 +2884,6 @@ INSERT IGNORE INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) V
 (10, 9, 22027, 'Remove Insignia'),
 (10, 9, 22810, 'Opening - No Text'),
 (10, 9, 28730, 'Arcane Torrent'),
-(10, 9, 28734, 'Mana Tap'),
 (10, 9, 28877, 'Arcane Affinity'),
 (10, 9, 58284, 'Chaos Bolt Passive'),
 (11, 1, 78, 'Heroic Strike'),

sql/characters.sql

@@ -316,9 +316,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `character_achievement`;
 CREATE TABLE `character_achievement` (
-  `guid` int(11) NOT NULL,
-  `achievement` int(11) NOT NULL,
-  `date` int(11) NOT NULL,
+  `guid` int(11) unsigned NOT NULL,
+  `achievement` int(11) unsigned  NOT NULL,
+  `date` bigint(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`guid`,`achievement`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
@@ -337,10 +337,10 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `character_achievement_progress`;
 CREATE TABLE `character_achievement_progress` (
-  `guid` int(11) NOT NULL,
-  `criteria` int(11) NOT NULL,
-  `counter` int(11) NOT NULL,
-  `date` int(11) NOT NULL,
+  `guid` int(11) unsigned NOT NULL,
+  `criteria` int(11) unsigned NOT NULL,
+  `counter` int(11) unsigned NOT NULL,
+  `date` bigint(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`guid`,`criteria`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
@@ -854,6 +854,7 @@ CREATE TABLE `gm_tickets` (
   `posX` float NOT NULL DEFAULT '0',
   `posY` float NOT NULL DEFAULT '0',
   `posZ` float NOT NULL DEFAULT '0',
+  `timestamp` int(10) NOT NULL default '0',
   `closed` int(10) NOT NULL default '0',
   `assignedto` int(10) NOT NULL default '0',
   `comment` text NOT NULL,

sql/mangos.sql

@@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `db_version`;
 CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
-  `required_7777_01_mangos_spell_proc_event` bit(1) default NULL
+  `required_7823_01_mangos_item_template` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -322,6 +322,7 @@ INSERT INTO `command` VALUES
 ('go graveyard',1,'Syntax: .go graveyard #graveyardId\r\n Teleport to graveyard with the graveyardId specified.'),
 ('go grid',1,'Syntax: .go grid #gridX #gridY [#mapId]\r\n\r\nTeleport the gm to center of grid with provided indexes at map #mapId (or current map if it not provided).'),
 ('go object',1,'Syntax: .go object #object_guid\r\nTeleport your character to gameobject with guid #object_guid'),
+('go taxinode',1,'Syntax: .go taxinode #taxinode\r\n\r\nTeleport player to taxinode coordinates. You can look up zone using .lookup taxinode $namepart'),
 ('go trigger',1,'Syntax: .go trigger #trigger_id\r\n\r\nTeleport your character to areatrigger with id #trigger_id. Character will be teleported to trigger target if selected areatrigger is telporting trigger.'),
 ('go xy',1,'Syntax: .go xy #x #y [#mapid]\r\n\r\nTeleport player to point with (#x,#y) coordinates at ground(water) level at map #mapid or same map if #mapid not provided.'),
 ('go xyz',1,'Syntax: .go xyz #x #y #z [#mapid]\r\n\r\nTeleport player to point with (#x,#y,#z) coordinates at ground(water) level at map #mapid or same map if #mapid not provided.'),
@@ -384,6 +385,7 @@ INSERT INTO `command` VALUES
 ('lookup quest',3,'Syntax: .lookup quest $namepart\r\n\r\nLooks up a quest by $namepart, and returns all matches with their quest ID\'s.'),
 ('lookup skill',3,'Syntax: .lookup skill $$namepart\r\n\r\nLooks up a skill by $namepart, and returns all matches with their skill ID\'s.'),
 ('lookup spell',3,'Syntax: .lookup spell $namepart\r\n\r\nLooks up a spell by $namepart, and returns all matches with their spell ID\'s.'),
+('lookup taxinode',3,'Syntax: .lookup taxinode $substring\r\n\r\nSearch and output all taxinodes with provide $substring in name.'),
 ('lookup tele',1,'Syntax: .lookup tele $substring\r\n\r\nSearch and output all .tele command locations with provide $substring in name.'),
 ('maxskill',3,'Syntax: .maxskill\r\nSets all skills of the targeted player to their maximum VALUESfor its current level.'),
 ('modify arena',1,'Syntax: .modify arena #value\r\nAdd $amount arena points to the selected player.'),
@@ -1709,7 +1711,7 @@ CREATE TABLE `item_template` (
   `stat_type10` tinyint(3) unsigned NOT NULL default '0',
   `stat_value10` smallint(6) NOT NULL default '0',
   `ScalingStatDistribution` smallint(6) NOT NULL default '0',
-  `ScalingStatValue` smallint(6) NOT NULL default '0',
+  `ScalingStatValue` int(6) unsigned NOT NULL default '0',
   `dmg_min1` float NOT NULL default '0',
   `dmg_max1` float NOT NULL default '0',
   `dmg_type1` tinyint(3) unsigned NOT NULL default '0',
@@ -2688,6 +2690,7 @@ INSERT INTO `mangos_string` VALUES
 (344,'You already have pet.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (345,'Forced customize for player %s will be requested at next login.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (346,'Forced customize for player %s (GUID #%u) will be requested at next login.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(347,'TaxiNode ID %u not found!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (400,'|cffff0000[System Message]:|rScripts reloaded',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (401,'You change security level of account %s to %i.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (402,'%s changed your security level to %i.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@@ -2753,6 +2756,7 @@ INSERT INTO `mangos_string` VALUES
 (463,'Teleport location added.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (464,'Teleport location NOT added: database error.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (465,'Teleport location deleted.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(466,'No taxinodes found!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (467,'Target unit has %d auras:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (468,'id: %d eff: %d type: %d duration: %d maxduration: %d name: %s%s%s caster: %s %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (469,'Target unit has %d auras of type %d:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@@ -3052,6 +3056,8 @@ INSERT INTO `mangos_string` VALUES
 (1125,'Your pet learned all talents',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1126,'Your pet talents have been reset.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1127,'Talents of %s\'s pet reset.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1128,'%d - |cffffffff|Htaxinode:%u|h[%s %s]|h|r (Map:%u X:%f Y:%f Z:%f)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1129,'%d - %s %s (Map:%u X:%f Y:%f Z:%f)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1200,'You try to view cinemitic %u but it doesn\'t exist.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1201,'You try to view movie %u but it doesn\'t exist.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `mangos_string` ENABLE KEYS */;
@@ -3152,6 +3158,27 @@ LOCK TABLES `npc_option` WRITE;
 /*!40000 ALTER TABLE `npc_option` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `npc_spellclick_spells`
+--
+
+DROP TABLE IF EXISTS `npc_spellclick_spells`;
+CREATE TABLE `npc_spellclick_spells` (
+    `npc_entry` INT UNSIGNED NOT NULL COMMENT 'reference to creature_template',
+    `spell_id` INT UNSIGNED NOT NULL COMMENT 'spell which should be casted ',
+    `quest_id` INT UNSIGNED NOT NULL COMMENT 'reference to quest_template',
+    `cast_flags` TINYINT UNSIGNED NOT NULL COMMENT 'first bit defines caster: 1=player, 0=creature; second bit defines target, same mapping as caster bit'
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `npc_spellclick_spells`
+--
+
+LOCK TABLES `npc_spellclick_spells` WRITE;
+/*!40000 ALTER TABLE `npc_spellclick_spells` DISABLE KEYS */;
+/*!40000 ALTER TABLE `npc_spellclick_spells` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `npc_text`
 --
@@ -17006,9 +17033,9 @@ INSERT INTO `spell_proc_event` VALUES
 (30293, 0x00000000,  5, 0x00000381, 0x000000C0, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (30295, 0x00000000,  5, 0x00000381, 0x000000C0, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (30296, 0x00000000,  5, 0x00000381, 0x000000C0, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(30299, 0x00000024,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(30301, 0x00000024,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(30302, 0x00000024,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
+(30299, 0x0000007E,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
+(30301, 0x0000007E,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
+(30302, 0x0000007E,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (30675, 0x00000000, 11, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (30678, 0x00000000, 11, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (30679, 0x00000000, 11, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
@@ -17094,6 +17121,7 @@ INSERT INTO `spell_proc_event` VALUES
 (33882, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (33883, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (33953, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 45),
+(34074, 0x00000000,  9, 0x0007FA43, 0x00881081, 0x00000201, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (34080, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0.000000, 0.000000,  0),
 (34138, 0x00000000, 11, 0x00000080, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (34139, 0x00000000, 10, 0x40000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),

sql/updates/2.4.3_updates/CMakeLists.txt

@@ -2,4 +2,4 @@ FILE(GLOB _SQL_243 *.sql)
 
 INSTALL(FILES
 ${_SQL_243}
-DESTINATION share/trinity/sql/updates/2.4.3_updates)
+DESTINATION share/trinity/sql/updates/2.4.3_updates)