From 131978c529c4bd57f7c258d2226f94b49860ef0c Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Wed, 1 Jul 2009 14:30:06 +0400
Subject: [PATCH] [8104] Always (except 2 cases) for tables in characters DB
 InnoDB and utf8.

---
 sql/characters.sql                 | 12 ++++++------
 sql/updates/8104_01_characters.sql |  8 ++++++++
 sql/updates/Makefile.am            |  2 ++
 src/shared/revision_nr.h           |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 sql/updates/8104_01_characters.sql

diff --git a/sql/characters.sql b/sql/characters.sql
index 8fb7327f2..0858b64cb 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -21,7 +21,7 @@
 
 DROP TABLE IF EXISTS `character_db_version`;
 CREATE TABLE `character_db_version` (
-  `required_8098_04_characters_pet_spell` bit(1) default NULL
+  `required_8104_01_characters` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
 
 --
@@ -264,7 +264,7 @@ CREATE TABLE `character_achievement` (
   `achievement` int(11) unsigned  NOT NULL,
   `date` bigint(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`guid`,`achievement`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
 -- Dumping data for table `character_achievement`
@@ -286,7 +286,7 @@ CREATE TABLE `character_achievement_progress` (
   `counter` int(11) unsigned NOT NULL,
   `date` bigint(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`guid`,`criteria`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
 -- Dumping data for table `character_achievement_progress`
@@ -359,7 +359,7 @@ CREATE TABLE `character_declinedname` (
   `instrumental` varchar(15) NOT NULL default '',
   `prepositional` varchar(15) NOT NULL default '',
   PRIMARY KEY  (`guid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
 
 --
 -- Dumping data for table `character_declinedname`
@@ -559,7 +559,7 @@ CREATE TABLE `character_pet_declinedname` (
   `prepositional` varchar(12) NOT NULL default '',
   PRIMARY KEY  (`id`),
   KEY owner_key (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
 
 --
 -- Dumping data for table `character_pet_declinedname`
@@ -1020,7 +1020,7 @@ CREATE TABLE `guild_eventlog` (
   `PlayerGuid2` int(11) NOT NULL COMMENT 'Player 2',
   `NewRank` tinyint(2) NOT NULL COMMENT 'New rank(in case promotion/demotion)',
   `TimeStamp` bigint(20) NOT NULL COMMENT 'Event UNIX time'
-) ENGINE = InnoDB DEFAULT CHARSET = latin1 COMMENT 'Guild Eventlog';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT 'Guild Eventlog';
 
 --
 -- Dumping data for table `guild_eventlog`
diff --git a/sql/updates/8104_01_characters.sql b/sql/updates/8104_01_characters.sql
new file mode 100644
index 000000000..0575ab82d
--- /dev/null
+++ b/sql/updates/8104_01_characters.sql
@@ -0,0 +1,8 @@
+ALTER TABLE character_db_version CHANGE COLUMN required_8098_04_characters_pet_spell required_8104_01_characters bit;
+
+ALTER TABLE character_achievement ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ALTER TABLE character_achievement_progress ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ALTER TABLE character_declinedname ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+ALTER TABLE character_pet_declinedname ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+ALTER TABLE guild_eventlog ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT 'Guild Eventlog';
+
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
index 48c1adc1f..5969c8cb1 100644
--- a/sql/updates/Makefile.am
+++ b/sql/updates/Makefile.am
@@ -239,6 +239,7 @@ pkgdata_DATA = \
 	8098_02_mangos_playercreateinfo_action.sql \
 	8098_03_characters_character_pet.sql \
 	8098_04_characters_pet_spell.sql \
+	8104_01_characters.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -458,4 +459,5 @@ EXTRA_DIST = \
 	8098_02_mangos_playercreateinfo_action.sql \
 	8098_03_characters_character_pet.sql \
 	8098_04_characters_pet_spell.sql \
+	8104_01_characters.sql \
 	README
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 104d40568..379744361 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8103"
+ #define REVISION_NR "8104"
 #endif // __REVISION_NR_H__