diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/characters.sql | 23 | ||||
| -rw-r--r-- | sql/updates/7644_01_characters_character_pet.sql | 5 |
2 files changed, 28 insertions, 0 deletions
diff --git a/sql/characters.sql b/sql/characters.sql index f5650a35981..97d1e744e7c 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -16,6 +16,29 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; -- +<<<<<<< HEAD:sql/characters.sql +======= +-- Table structure for table `character_db_version` +-- + +DROP TABLE IF EXISTS `character_db_version`; +CREATE TABLE `character_db_version` ( + `required_7644_01_characters_character_pet` bit(1) default NULL +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB'; + +-- +-- Dumping data for table `character_db_version` +-- + +LOCK TABLES `character_db_version` WRITE; +/*!40000 ALTER TABLE `character_db_version` DISABLE KEYS */; +INSERT INTO `character_db_version` VALUES +(NULL); +/*!40000 ALTER TABLE `character_db_version` ENABLE KEYS */; +UNLOCK TABLES; + +-- +>>>>>>> ddfa7199207e499dd233854a75ac3a6216938873:sql/characters.sql -- Table structure for table `account_data` -- diff --git a/sql/updates/7644_01_characters_character_pet.sql b/sql/updates/7644_01_characters_character_pet.sql new file mode 100644 index 00000000000..03e38a0d8eb --- /dev/null +++ b/sql/updates/7644_01_characters_character_pet.sql @@ -0,0 +1,5 @@ +ALTER TABLE character_db_version CHANGE COLUMN required_7546_01_characters_uptime required_7644_01_characters_character_pet bit; + +/* only hunter pets must be in stable */ +UPDATE `character_pet` + SET slot = 100 WHERE PetType <> 1 AND slot >= 1 AND slot <= 4; |