- Removed mer_id from main.sql in char table. (Bug Report 2192)

- Removed 13117 sql patch, not necessary anymore.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13197 54d463be-8e91-2dee-dedb-b68131a5f0ec

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',

sql-files/upgrade_svn13117_char.sql

@@ -1 +0,0 @@
-ALTER TABLE `char` ADD COLUMN `mer_id` INTEGER UNSIGNED NOT NULL DEFAULT '0' AFTER `homun_id`;