summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-07 10:56:08 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-07 10:56:08 +0000
commit1d4ff1617bfd1bb412f2c559485e7bc4ee828c49 (patch)
tree003b721e3000a3c6068e2fe12d5608c5d10d1802
parentcdfb5bc41b27f1fd5c12cc39a9d3c130b7560800 (diff)
downloadhercules-1d4ff1617bfd1bb412f2c559485e7bc4ee828c49.tar.gz
hercules-1d4ff1617bfd1bb412f2c559485e7bc4ee828c49.tar.bz2
hercules-1d4ff1617bfd1bb412f2c559485e7bc4ee828c49.tar.xz
hercules-1d4ff1617bfd1bb412f2c559485e7bc4ee828c49.zip
- Removed mer_id from main.sql in char table. (Bug Report 2192)
- Removed 13117 sql patch, not necessary anymore. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13197 54d463be-8e91-2dee-dedb-b68131a5f0ec
-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