2 files changed, 29 insertions, 0 deletions
diff --git a/sql-files/main.sql b/sql-files/main.sql
index c06b8dac6..a79eee0e1 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -482,6 +482,21 @@ CREATE TABLE IF NOT EXISTS `memo` (
 ) ENGINE=MyISAM;
 
 --
+-- Table structure for table `mercenary`
+--
+
+CREATE TABLE IF NOT EXISTS `mercenary` (
+  `mer_id` int(11) unsigned NOT NULL auto_increment,
+  `char_id` int(11) NOT NULL,
+  `class` mediumint(9) unsigned NOT NULL default '0',
+  `hp` int(12) NOT NULL default '1',
+  `sp` int(12) NOT NULL default '1',
+  `kill_counter` int(11) NOT NULL,
+  `life_time` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`mer_id`)
+) ENGINE=MyISAM;
+
+--
 -- Table structure for table `party`
 --
 
diff --git a/sql-files/upgrade_svn13115_mercenary.sql b/sql-files/upgrade_svn13115_mercenary.sql
new file mode 100644
index 000000000..bcb7cff31
--- /dev/null
+++ b/sql-files/upgrade_svn13115_mercenary.sql
@@ -0,0 +1,14 @@
+--
+-- Table structure for table `mercenary`
+--
+
+CREATE TABLE IF NOT EXISTS `mercenary` (
+  `mer_id` int(11) unsigned NOT NULL auto_increment,
+  `char_id` int(11) NOT NULL,
+  `class` mediumint(9) unsigned NOT NULL default '0',
+  `hp` int(12) NOT NULL default '1',
+  `sp` int(12) NOT NULL default '1',
+  `kill_counter` int(11) NOT NULL,
+  `life_time` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`mer_id`)
+) ENGINE=MyISAM;