*Backup your DB!

    [8098] Support uint32 spell ids in code. Author: VladimirMangos

    * Propertly work with uint32 spell ids in player action bar
    * Fix in same time bug with not save equipment set button with id==0
    * Merge misc field in character_action and playercreateinfo_action to action field as 3 byte
    * Propertly load uint32 spell ids from character_spell
    * Fixed types for some pet/creature related structure for spell id storing.

--HG--
branch : trunk

4 files changed, 395 insertions, 360 deletions

diff --git a/sql/characters.sql b/sql/characters.sql
index 693ddfed803..4271dd02db6 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -23,7 +23,7 @@
 
 DROP TABLE IF EXISTS `character_db_version`;
 CREATE TABLE `character_db_version` (
-  `required_8072_02_characters_characters` bit(1) default NULL
+  `required_8098_04_characters_pet_spell` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
 
 --
@@ -389,9 +389,8 @@ DROP TABLE IF EXISTS `character_action`;
 CREATE TABLE `character_action` (
   `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
   `button` tinyint(3) unsigned NOT NULL default '0',
-  `action` smallint(5) unsigned NOT NULL default '0',
+  `action` int(11) unsigned NOT NULL default '0',
   `type` tinyint(3) unsigned NOT NULL default '0',
-  `misc` tinyint(3) unsigned NOT NULL default '0',
   PRIMARY KEY  (`guid`,`button`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
 
diff --git a/sql/mangos.sql b/sql/mangos.sql
index f9200e335f8..4f7970d1712 100644
--- a/sql/mangos.sql
+++ b/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_8071_01_mangos_command` bit(1) default NULL
+  `required_8098_02_mangos_playercreateinfo_action` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -9720,9 +9720,8 @@ CREATE TABLE `playercreateinfo_action` (
   `race` tinyint(3) unsigned NOT NULL default '0',
   `class` tinyint(3) unsigned NOT NULL default '0',
   `button` smallint(5) unsigned NOT NULL default '0',
-  `action` smallint(5) unsigned NOT NULL default '0',
+  `action` int(11) unsigned NOT NULL default '0',
   `type` smallint(5) unsigned NOT NULL default '0',
-  `misc` smallint(5) unsigned NOT NULL default '0',
   KEY `playercreateinfo_race_class_index` (`race`,`class`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
@@ -9733,360 +9732,360 @@ CREATE TABLE `playercreateinfo_action` (
 LOCK TABLES `playercreateinfo_action` WRITE;
 /*!40000 ALTER TABLE `playercreateinfo_action` DISABLE KEYS */;
 INSERT INTO `playercreateinfo_action` VALUES
-(1,1,1,78,0,0),
-(1,1,0,6603,0,0),
-(1,1,11,117,128,0),
-(1,2,2,635,0,0),
-(1,2,0,6603,0,0),
-(1,2,1,21084,0,0),
-(1,2,10,159,128,0),
-(1,2,11,2070,128,0),
-(1,4,1,1752,0,0),
-(1,4,2,2098,0,0),
-(1,4,3,2764,0,0),
-(1,4,0,6603,0,0),
-(1,4,11,2070,128,0),
-(1,5,1,585,0,0),
-(1,5,2,2050,0,0),
-(1,5,0,6603,0,0),
-(1,5,10,159,128,0),
-(1,5,11,2070,128,0),
-(1,6,0,6603,0,0),
-(1,6,1,49576,0,0),
-(1,6,2,45477,0,0),
-(1,6,3,45462,0,0),
-(1,6,4,45902,0,0),
-(1,6,5,47541,0,0),
-(1,6,11,59752,0,0),
-(1,8,1,133,0,0),
-(1,8,2,168,0,0),
-(1,8,0,6603,0,0),
-(1,8,10,159,128,0),
-(1,8,11,2070,128,0),
-(1,9,1,686,0,0),
-(1,9,2,687,0,0),
-(1,9,0,6603,0,0),
-(1,9,10,159,128,0),
-(1,9,11,4604,128,0),
-(2,1,1,78,0,0),
-(2,1,0,6603,0,0),
-(2,1,11,117,128,0),
-(2,3,2,75,0,0),
-(2,3,1,2973,0,0),
-(2,3,0,6603,0,0),
-(2,3,11,117,128,0),
-(2,3,10,159,128,0),
-(2,4,10,0,128,0),
-(2,4,1,1752,0,0),
-(2,4,2,2098,0,0),
-(2,4,0,6603,0,0),
-(2,4,11,117,128,0),
-(2,6,0,6603,0,0),
-(2,6,1,49576,0,0),
-(2,6,2,45477,0,0),
-(2,6,3,45462,0,0),
-(2,6,4,45902,0,0),
-(2,6,5,47541,0,0),
-(2,6,10,20572,0,0),
-(2,7,2,331,0,0),
-(2,7,1,403,0,0),
-(2,7,0,6603,0,0),
-(2,7,11,117,128,0),
-(2,7,10,159,128,0),
-(2,9,1,686,0,0),
-(2,9,2,687,0,0),
-(2,9,0,6603,0,0),
-(2,9,11,117,128,0),
-(2,9,10,159,128,0),
-(3,1,1,78,0,0),
-(3,1,0,6603,0,0),
-(3,1,11,117,128,0),
-(3,2,2,635,0,0),
-(3,2,0,6603,0,0),
-(3,2,1,21084,0,0),
-(3,2,10,159,128,0),
-(3,2,11,4540,128,0),
-(3,3,2,75,0,0),
-(3,3,1,2973,0,0),
-(3,3,0,6603,0,0),
-(3,3,11,117,128,0),
-(3,3,10,159,128,0),
-(3,4,1,1752,0,0),
-(3,4,2,2098,0,0),
-(3,4,3,2764,0,0),
-(3,4,0,6603,0,0),
-(3,4,11,4540,128,0),
-(3,5,1,585,0,0),
-(3,5,2,2050,0,0),
-(3,5,0,6603,0,0),
-(3,5,10,159,128,0),
-(3,5,11,4540,128,0),
-(3,6,0,6603,0,0),
-(3,6,1,49576,0,0),
-(3,6,2,45477,0,0),
-(3,6,3,45462,0,0),
-(3,6,4,45902,0,0),
-(3,6,5,47541,0,0),
-(3,6,10,2481,0,0),
-(4,1,1,78,0,0),
-(4,1,0,6603,0,0),
-(4,1,11,117,128,0),
-(4,3,2,75,0,0),
-(4,3,1,2973,0,0),
-(4,3,0,6603,0,0),
-(4,3,11,117,128,0),
-(4,3,10,159,128,0),
-(4,4,1,1752,0,0),
-(4,4,2,2098,0,0),
-(4,4,3,2764,0,0),
-(4,4,0,6603,0,0),
-(4,4,11,4540,128,0),
-(4,5,1,585,0,0),
-(4,5,2,2050,0,0),
-(4,5,0,6603,0,0),
-(4,5,10,159,128,0),
-(4,5,11,2070,128,0),
-(4,6,0,6603,0,0),
-(4,6,1,49576,0,0),
-(4,6,2,45477,0,0),
-(4,6,3,45462,0,0),
-(4,6,4,45902,0,0),
-(4,6,5,47541,0,0),
-(4,6,10,58984,0,0),
-(4,6,83,58984,0,0),
-(4,11,1,5176,0,0),
-(4,11,2,5185,0,0),
-(4,11,0,6603,0,0),
-(4,11,10,159,128,0),
-(4,11,11,4536,128,0),
-(5,1,11,4604,128,0),
-(5,1,0,6603,0,0),
-(5,1,1,78,0,0),
-(5,4,11,4604,128,0),
-(5,4,3,2764,0,0),
-(5,4,2,2098,0,0),
-(5,4,1,1752,0,0),
-(5,4,0,6603,0,0),
-(5,5,10,159,128,0),
-(5,5,2,2050,0,0),
-(5,5,1,585,0,0),
-(5,5,11,4604,128,0),
-(5,5,0,6603,0,0),
-(5,6,0,6603,0,0),
-(5,6,1,49576,0,0),
-(5,6,2,45477,0,0),
-(5,6,3,45462,0,0),
-(5,6,4,45902,0,0),
-(5,6,5,47541,0,0),
-(5,6,10,20577,0,0),
-(5,8,11,4604,128,0),
-(5,8,10,159,128,0),
-(5,8,2,168,0,0),
-(5,8,1,133,0,0),
-(5,8,0,6603,0,0),
-(5,9,1,686,0,0),
-(5,9,10,159,128,0),
-(5,9,2,687,0,0),
-(5,9,11,4604,128,0),
-(5,9,0,6603,0,0),
-(6,1,1,78,0,0),
-(6,1,2,20549,0,0),
-(6,1,11,4540,128,0),
-(6,1,0,6603,0,0),
-(6,3,1,2973,0,0),
-(6,3,10,159,128,0),
-(6,3,2,75,0,0),
-(6,3,3,20549,0,0),
-(6,3,11,117,128,0),
-(6,3,0,6603,0,0),
-(6,6,0,6603,0,0),
-(6,6,1,49576,0,0),
-(6,6,2,45477,0,0),
-(6,6,3,45462,0,0),
-(6,6,4,45902,0,0),
-(6,6,5,47541,0,0),
-(6,6,10,20549,0,0),
-(6,6,75,20549,0,0),
-(6,7,1,403,0,0),
-(6,7,10,159,128,0),
-(6,7,2,331,0,0),
-(6,7,3,20549,0,0),
-(6,7,11,4604,128,0),
-(6,7,0,6603,0,0),
-(6,11,1,5176,0,0),
-(6,11,10,159,128,0),
-(6,11,2,5185,0,0),
-(6,11,3,20549,0,0),
-(6,11,11,4536,128,0),
-(6,11,0,6603,0,0),
-(7,1,11,117,128,0),
-(7,1,1,78,0,0),
-(7,1,0,6603,0,0),
-(7,4,11,117,128,0),
-(7,4,3,2764,0,0),
-(7,4,1,1752,0,0),
-(7,4,2,2098,0,0),
-(7,4,0,6603,0,0),
-(7,6,0,6603,0,0),
-(7,6,1,49576,0,0),
-(7,6,2,45477,0,0),
-(7,6,3,45462,0,0),
-(7,6,4,45902,0,0),
-(7,6,5,47541,0,0),
-(7,6,10,20589,0,0),
-(7,6,72,6603,0,0),
-(7,6,83,117,128,0),
-(7,6,84,6603,0,0),
-(7,6,96,6603,0,0),
-(7,6,108,6603,0,0),
-(7,8,11,4536,128,0),
-(7,8,1,133,0,0),
-(7,8,2,168,0,0),
-(7,8,10,159,128,0),
-(7,8,0,6603,0,0),
-(7,9,11,4604,128,0),
-(7,9,1,686,0,0),
-(7,9,2,687,0,0),
-(7,9,10,159,128,0),
-(7,9,0,6603,0,0),
-(8,1,11,117,128,0),
-(8,1,1,78,0,0),
-(8,1,3,2764,0,0),
-(8,1,0,6603,0,0),
-(8,3,10,159,128,0),
-(8,3,11,4604,128,0),
-(8,3,1,2973,0,0),
-(8,3,2,75,0,0),
-(8,3,0,6603,0,0),
-(8,4,1,1752,0,0),
-(8,4,3,2764,0,0),
-(8,4,2,2098,0,0),
-(8,4,11,117,128,0),
-(8,4,0,6603,0,0),
-(8,5,1,585,0,0),
-(8,5,10,159,128,0),
-(8,5,2,2050,0,0),
-(8,5,11,4540,128,0),
-(8,5,0,6603,0,0),
-(8,6,0,6603,0,0),
-(8,6,1,49576,0,0),
-(8,6,2,45477,0,0),
-(8,6,3,45462,0,0),
-(8,6,4,45902,0,0),
-(8,6,5,47541,0,0),
-(8,6,10,50621,0,0),
-(8,7,1,403,0,0),
-(8,7,10,159,128,0),
-(8,7,2,331,0,0),
-(8,7,11,117,128,0),
-(8,7,0,6603,0,0),
-(8,8,1,133,0,0),
-(8,8,10,159,128,0),
-(8,8,2,168,0,0),
-(8,8,11,117,128,0),
-(8,8,0,6603,0,0),
-(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,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,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,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,10,159,128,0),
-(10,5,11,20857,128,0),
-(10,6,0,6603,0,0),
-(10,6,1,49576,0,0),
-(10,6,2,45477,0,0),
-(10,6,3,45462,0,0),
-(10,6,4,45902,0,0),
-(10,6,5,47541,0,0),
-(10,6,6,50613,0,0),
-(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,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,2,687,0,0),
-(10,9,1,686,0,0),
-(10,9,0,6603,0,0),
-(11,1,0,6603,0,0),
-(11,1,72,6603,0,0),
-(11,1,73,78,0,0),
-(11,1,74,28880,0,0),
-(11,1,83,4540,128,0),
-(11,1,84,6603,0,0),
-(11,1,96,6603,0,0),
-(11,1,108,6603,0,0),
-(11,2,0,6603,0,0),
-(11,2,1,21084,0,0),
-(11,2,2,635,0,0),
-(11,2,3,59542,0,0),
-(11,2,10,159,128,0),
-(11,2,11,4540,128,0),
-(11,2,83,4540,128,0),
-(11,3,0,6603,0,0),
-(11,3,1,2973,0,0),
-(11,3,2,75,0,0),
-(11,3,3,59543,0,0),
-(11,3,10,159,128,0),
-(11,3,11,4540,128,0),
-(11,3,72,6603,0,0),
-(11,3,73,2973,0,0),
-(11,3,74,75,0,0),
-(11,3,82,159,128,0),
-(11,3,83,4540,128,0),
-(11,5,0,6603,0,0),
-(11,5,1,585,0,0),
-(11,5,2,2050,0,0),
-(11,5,3,59544,0,0),
-(11,5,10,159,128,0),
-(11,5,11,4540,128,0),
-(11,5,83,4540,128,0),
-(11,6,0,6603,0,0),
-(11,6,1,49576,0,0),
-(11,6,2,45477,0,0),
-(11,6,3,45462,0,0),
-(11,6,4,45902,0,0),
-(11,6,5,47541,0,0),
-(11,6,6,59545,0,0),
-(11,7,0,6603,0,0),
-(11,7,1,403,0,0),
-(11,7,2,331,0,0),
-(11,7,3,59547,0,0),
-(11,7,10,159,128,0),
-(11,7,11,4540,128,0),
-(11,8,0,6603,0,0),
-(11,8,1,133,0,0),
-(11,8,2,168,0,0),
-(11,8,3,59548,0,0),
-(11,8,10,159,128,0),
-(11,8,11,4540,128,0),
-(11,8,83,4540,128,0);
+(1,1,1,78,0),
+(1,1,0,6603,0),
+(1,1,11,117,128),
+(1,2,2,635,0),
+(1,2,0,6603,0),
+(1,2,1,21084,0),
+(1,2,10,159,128),
+(1,2,11,2070,128),
+(1,4,1,1752,0),
+(1,4,2,2098,0),
+(1,4,3,2764,0),
+(1,4,0,6603,0),
+(1,4,11,2070,128),
+(1,5,1,585,0),
+(1,5,2,2050,0),
+(1,5,0,6603,0),
+(1,5,10,159,128),
+(1,5,11,2070,128),
+(1,6,0,6603,0),
+(1,6,1,49576,0),
+(1,6,2,45477,0),
+(1,6,3,45462,0),
+(1,6,4,45902,0),
+(1,6,5,47541,0),
+(1,6,11,59752,0),
+(1,8,1,133,0),
+(1,8,2,168,0),
+(1,8,0,6603,0),
+(1,8,10,159,128),
+(1,8,11,2070,128),
+(1,9,1,686,0),
+(1,9,2,687,0),
+(1,9,0,6603,0),
+(1,9,10,159,128),
+(1,9,11,4604,128),
+(2,1,1,78,0),
+(2,1,0,6603,0),
+(2,1,11,117,128),
+(2,3,2,75,0),
+(2,3,1,2973,0),
+(2,3,0,6603,0),
+(2,3,11,117,128),
+(2,3,10,159,128),
+(2,4,10,0,128),
+(2,4,1,1752,0),
+(2,4,2,2098,0),
+(2,4,0,6603,0),
+(2,4,11,117,128),
+(2,6,0,6603,0),
+(2,6,1,49576,0),
+(2,6,2,45477,0),
+(2,6,3,45462,0),
+(2,6,4,45902,0),
+(2,6,5,47541,0),
+(2,6,10,20572,0),
+(2,7,2,331,0),
+(2,7,1,403,0),
+(2,7,0,6603,0),
+(2,7,11,117,128),
+(2,7,10,159,128),
+(2,9,1,686,0),
+(2,9,2,687,0),
+(2,9,0,6603,0),
+(2,9,11,117,128),
+(2,9,10,159,128),
+(3,1,1,78,0),
+(3,1,0,6603,0),
+(3,1,11,117,128),
+(3,2,2,635,0),
+(3,2,0,6603,0),
+(3,2,1,21084,0),
+(3,2,10,159,128),
+(3,2,11,4540,128),
+(3,3,2,75,0),
+(3,3,1,2973,0),
+(3,3,0,6603,0),
+(3,3,11,117,128),
+(3,3,10,159,128),
+(3,4,1,1752,0),
+(3,4,2,2098,0),
+(3,4,3,2764,0),
+(3,4,0,6603,0),
+(3,4,11,4540,128),
+(3,5,1,585,0),
+(3,5,2,2050,0),
+(3,5,0,6603,0),
+(3,5,10,159,128),
+(3,5,11,4540,128),
+(3,6,0,6603,0),
+(3,6,1,49576,0),
+(3,6,2,45477,0),
+(3,6,3,45462,0),
+(3,6,4,45902,0),
+(3,6,5,47541,0),
+(3,6,10,2481,0),
+(4,1,1,78,0),
+(4,1,0,6603,0),
+(4,1,11,117,128),
+(4,3,2,75,0),
+(4,3,1,2973,0),
+(4,3,0,6603,0),
+(4,3,11,117,128),
+(4,3,10,159,128),
+(4,4,1,1752,0),
+(4,4,2,2098,0),
+(4,4,3,2764,0),
+(4,4,0,6603,0),
+(4,4,11,4540,128),
+(4,5,1,585,0),
+(4,5,2,2050,0),
+(4,5,0,6603,0),
+(4,5,10,159,128),
+(4,5,11,2070,128),
+(4,6,0,6603,0),
+(4,6,1,49576,0),
+(4,6,2,45477,0),
+(4,6,3,45462,0),
+(4,6,4,45902,0),
+(4,6,5,47541,0),
+(4,6,10,58984,0),
+(4,6,83,58984,0),
+(4,11,1,5176,0),
+(4,11,2,5185,0),
+(4,11,0,6603,0),
+(4,11,10,159,128),
+(4,11,11,4536,128),
+(5,1,11,4604,128),
+(5,1,0,6603,0),
+(5,1,1,78,0),
+(5,4,11,4604,128),
+(5,4,3,2764,0),
+(5,4,2,2098,0),
+(5,4,1,1752,0),
+(5,4,0,6603,0),
+(5,5,10,159,128),
+(5,5,2,2050,0),
+(5,5,1,585,0),
+(5,5,11,4604,128),
+(5,5,0,6603,0),
+(5,6,0,6603,0),
+(5,6,1,49576,0),
+(5,6,2,45477,0),
+(5,6,3,45462,0),
+(5,6,4,45902,0),
+(5,6,5,47541,0),
+(5,6,10,20577,0),
+(5,8,11,4604,128),
+(5,8,10,159,128),
+(5,8,2,168,0),
+(5,8,1,133,0),
+(5,8,0,6603,0),
+(5,9,1,686,0),
+(5,9,10,159,128),
+(5,9,2,687,0),
+(5,9,11,4604,128),
+(5,9,0,6603,0),
+(6,1,1,78,0),
+(6,1,2,20549,0),
+(6,1,11,4540,128),
+(6,1,0,6603,0),
+(6,3,1,2973,0),
+(6,3,10,159,128),
+(6,3,2,75,0),
+(6,3,3,20549,0),
+(6,3,11,117,128),
+(6,3,0,6603,0),
+(6,6,0,6603,0),
+(6,6,1,49576,0),
+(6,6,2,45477,0),
+(6,6,3,45462,0),
+(6,6,4,45902,0),
+(6,6,5,47541,0),
+(6,6,10,20549,0),
+(6,6,75,20549,0),
+(6,7,1,403,0),
+(6,7,10,159,128),
+(6,7,2,331,0),
+(6,7,3,20549,0),
+(6,7,11,4604,128),
+(6,7,0,6603,0),
+(6,11,1,5176,0),
+(6,11,10,159,128),
+(6,11,2,5185,0),
+(6,11,3,20549,0),
+(6,11,11,4536,128),
+(6,11,0,6603,0),
+(7,1,11,117,128),
+(7,1,1,78,0),
+(7,1,0,6603,0),
+(7,4,11,117,128),
+(7,4,3,2764,0),
+(7,4,1,1752,0),
+(7,4,2,2098,0),
+(7,4,0,6603,0),
+(7,6,0,6603,0),
+(7,6,1,49576,0),
+(7,6,2,45477,0),
+(7,6,3,45462,0),
+(7,6,4,45902,0),
+(7,6,5,47541,0),
+(7,6,10,20589,0),
+(7,6,72,6603,0),
+(7,6,83,117,128),
+(7,6,84,6603,0),
+(7,6,96,6603,0),
+(7,6,108,6603,0),
+(7,8,11,4536,128),
+(7,8,1,133,0),
+(7,8,2,168,0),
+(7,8,10,159,128),
+(7,8,0,6603,0),
+(7,9,11,4604,128),
+(7,9,1,686,0),
+(7,9,2,687,0),
+(7,9,10,159,128),
+(7,9,0,6603,0),
+(8,1,11,117,128),
+(8,1,1,78,0),
+(8,1,3,2764,0),
+(8,1,0,6603,0),
+(8,3,10,159,128),
+(8,3,11,4604,128),
+(8,3,1,2973,0),
+(8,3,2,75,0),
+(8,3,0,6603,0),
+(8,4,1,1752,0),
+(8,4,3,2764,0),
+(8,4,2,2098,0),
+(8,4,11,117,128),
+(8,4,0,6603,0),
+(8,5,1,585,0),
+(8,5,10,159,128),
+(8,5,2,2050,0),
+(8,5,11,4540,128),
+(8,5,0,6603,0),
+(8,6,0,6603,0),
+(8,6,1,49576,0),
+(8,6,2,45477,0),
+(8,6,3,45462,0),
+(8,6,4,45902,0),
+(8,6,5,47541,0),
+(8,6,10,50621,0),
+(8,7,1,403,0),
+(8,7,10,159,128),
+(8,7,2,331,0),
+(8,7,11,117,128),
+(8,7,0,6603,0),
+(8,8,1,133,0),
+(8,8,10,159,128),
+(8,8,2,168,0),
+(8,8,11,117,128),
+(8,8,0,6603,0),
+(10,2,0,6603,0),
+(10,2,1,21084,0),
+(10,2,2,635,0),
+(10,2,3,28734,0),
+(10,2,4,28730,0),
+(10,2,10,159,128),
+(10,2,11,20857,128),
+(10,3,0,6603,0),
+(10,3,1,2973,0),
+(10,3,2,75,0),
+(10,3,3,28734,0),
+(10,3,4,28730,0),
+(10,3,10,159,128),
+(10,3,11,20857,128),
+(10,4,0,6603,0),
+(10,4,1,1752,0),
+(10,4,2,2098,0),
+(10,4,3,2764,0),
+(10,4,4,28734,0),
+(10,4,5,25046,0),
+(10,4,11,20857,128),
+(10,5,0,6603,0),
+(10,5,1,585,0),
+(10,5,2,2050,0),
+(10,5,3,28734,0),
+(10,5,4,28730,0),
+(10,5,10,159,128),
+(10,5,11,20857,128),
+(10,6,0,6603,0),
+(10,6,1,49576,0),
+(10,6,2,45477,0),
+(10,6,3,45462,0),
+(10,6,4,45902,0),
+(10,6,5,47541,0),
+(10,6,6,50613,0),
+(10,8,0,6603,0),
+(10,8,1,133,0),
+(10,8,2,168,0),
+(10,8,3,28734,0),
+(10,8,4,28730,0),
+(10,8,10,159,128),
+(10,8,11,20857,128),
+(10,9,11,20857,128),
+(10,9,10,159,128),
+(10,9,4,28730,0),
+(10,9,3,28734,0),
+(10,9,2,687,0),
+(10,9,1,686,0),
+(10,9,0,6603,0),
+(11,1,0,6603,0),
+(11,1,72,6603,0),
+(11,1,73,78,0),
+(11,1,74,28880,0),
+(11,1,83,4540,128),
+(11,1,84,6603,0),
+(11,1,96,6603,0),
+(11,1,108,6603,0),
+(11,2,0,6603,0),
+(11,2,1,21084,0),
+(11,2,2,635,0),
+(11,2,3,59542,0),
+(11,2,10,159,128),
+(11,2,11,4540,128),
+(11,2,83,4540,128),
+(11,3,0,6603,0),
+(11,3,1,2973,0),
+(11,3,2,75,0),
+(11,3,3,59543,0),
+(11,3,10,159,128),
+(11,3,11,4540,128),
+(11,3,72,6603,0),
+(11,3,73,2973,0),
+(11,3,74,75,0),
+(11,3,82,159,128),
+(11,3,83,4540,128),
+(11,5,0,6603,0),
+(11,5,1,585,0),
+(11,5,2,2050,0),
+(11,5,3,59544,0),
+(11,5,10,159,128),
+(11,5,11,4540,128),
+(11,5,83,4540,128),
+(11,6,0,6603,0),
+(11,6,1,49576,0),
+(11,6,2,45477,0),
+(11,6,3,45462,0),
+(11,6,4,45902,0),
+(11,6,5,47541,0),
+(11,6,6,59545,0),
+(11,7,0,6603,0),
+(11,7,1,403,0),
+(11,7,2,331,0),
+(11,7,3,59547,0),
+(11,7,10,159,128),
+(11,7,11,4540,128),
+(11,8,0,6603,0),
+(11,8,1,133,0),
+(11,8,2,168,0),
+(11,8,3,59548,0),
+(11,8,10,159,128),
+(11,8,11,4540,128),
+(11,8,83,4540,128);
 /*!40000 ALTER TABLE `playercreateinfo_action` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/updates/4346_8098_characters.sql b/sql/updates/4346_8098_characters.sql
new file mode 100644
index 00000000000..158e36500d9
--- /dev/null
+++ b/sql/updates/4346_8098_characters.sql
@@ -0,0 +1,27 @@
+-- ALTER TABLE character_db_version CHANGE COLUMN required_8072_02_characters_characters required_8098_01_characters_character_action bit;
+
+ALTER TABLE character_action
+  CHANGE COLUMN action action int(11) unsigned NOT NULL default '0';
+
+UPDATE character_action
+  SET action = action | ( misc < 16 );
+
+ALTER TABLE character_action
+    DROP COLUMN misc;
+
+
+UPDATE character_pet
+   SET abdata = CONCAT(
+     (SUBSTRING(abdata, 1, length(SUBSTRING_INDEX(abdata, ' ', 1))) >> 8),' ',
+     SUBSTRING(abdata, length(SUBSTRING_INDEX(abdata, ' ', 1))+2, length(SUBSTRING_INDEX(abdata, ' ', 2))-length(SUBSTRING_INDEX(abdata, ' ', 1))-1),' ',
+     (SUBSTRING(abdata, length(SUBSTRING_INDEX(abdata, ' ', 2))+2, length(SUBSTRING_INDEX(abdata, ' ', 3))-length(SUBSTRING_INDEX(abdata, ' ', 2))-1) >> 8),' ',
+     SUBSTRING(abdata, length(SUBSTRING_INDEX(abdata, ' ', 3))+2, length(SUBSTRING_INDEX(abdata, ' ', 4))-length(SUBSTRING_INDEX(abdata, ' ', 3))-1),' ',
+     (SUBSTRING(abdata, length(SUBSTRING_INDEX(abdata, ' ', 4))+2, length(SUBSTRING_INDEX(abdata, ' ', 5))-length(SUBSTRING_INDEX(abdata, ' ', 4))-1) >> 8),' ',
+     SUBSTRING(abdata, length(SUBSTRING_INDEX(abdata, ' ', 5))+2, length(SUBSTRING_INDEX(abdata, ' ', 6))-length(SUBSTRING_INDEX(abdata, ' ', 5))-1),' ',
+     (SUBSTRING(abdata, length(SUBSTRING_INDEX(abdata, ' ', 6))+2, length(SUBSTRING_INDEX(abdata, ' ', 7))-length(SUBSTRING_INDEX(abdata, ' ', 6))-1) >> 8),' ',
+     SUBSTRING(abdata, length(SUBSTRING_INDEX(abdata, ' ', 7))+2, length(SUBSTRING_INDEX(abdata, ' ', 8))-length(SUBSTRING_INDEX(abdata, ' ', 7))-1),' '
+  );
+
+
+UPDATE pet_spell
+   SET active = ( active >> 8);
diff --git a/sql/updates/4346_8098_world.sql b/sql/updates/4346_8098_world.sql
new file mode 100644
index 00000000000..36e0dd7a3e7
--- /dev/null
+++ b/sql/updates/4346_8098_world.sql
@@ -0,0 +1,10 @@
+-- ALTER TABLE db_version CHANGE COLUMN required_8071_01_mangos_command required_8098_02_mangos_playercreateinfo_action bit;
+
+ALTER TABLE playercreateinfo_action
+  CHANGE COLUMN action action int(11) unsigned NOT NULL default '0';
+
+UPDATE playercreateinfo_action
+  SET action = action | ( misc < 16 );
+
+ALTER TABLE playercreateinfo_action
+    DROP COLUMN misc;