summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql-files/main.sql1
-rw-r--r--sql-files/upgrade_svn13117_char.sql1
2 files changed, 0 insertions, 2 deletions
diff --git a/sql-files/main.sql b/sql-files/main.sql
index 346e19ca1..2e2ea2cda 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -79,7 +79,6 @@ CREATE TABLE IF NOT EXISTS `char` (
`guild_id` int(11) unsigned NOT NULL default '0',
`pet_id` int(11) unsigned NOT NULL default '0',
`homun_id` int(11) unsigned NOT NULL default '0',
- `mer_id` int(11) unsigned NOT NULL default '0',
`hair` tinyint(4) unsigned NOT NULL default '0',
`hair_color` smallint(5) unsigned NOT NULL default '0',
`clothes_color` smallint(5) unsigned NOT NULL default '0',
diff --git a/sql-files/upgrade_svn13117_char.sql b/sql-files/upgrade_svn13117_char.sql
deleted file mode 100644
index 99fea2086..000000000
--- a/sql-files/upgrade_svn13117_char.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `char` ADD COLUMN `mer_id` INTEGER UNSIGNED NOT NULL DEFAULT '0' AFTER `homun_id`; \ No newline at end of file