summaryrefslogtreecommitdiff
path: root/sql-files
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-26 22:36:41 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-26 22:36:41 +0000
commit6096ce0b42a3eee07dc70ae5ef489aa4c30bf515 (patch)
treee91f8afd3b7b8b80f0c55aae07f7a478f469c37a /sql-files
parent23e1b7db5ba2277a406fc84c30e87c324a83097c (diff)
downloadhercules-6096ce0b42a3eee07dc70ae5ef489aa4c30bf515.tar.gz
hercules-6096ce0b42a3eee07dc70ae5ef489aa4c30bf515.tar.bz2
hercules-6096ce0b42a3eee07dc70ae5ef489aa4c30bf515.tar.xz
hercules-6096ce0b42a3eee07dc70ae5ef489aa4c30bf515.zip
* Merged changes from trunk [14496:14630/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14632 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'sql-files')
-rw-r--r--sql-files/main.sql3
-rw-r--r--sql-files/upgrade_svn14507.sql1
-rw-r--r--sql-files/upgrade_svn14579.sql1
3 files changed, 3 insertions, 2 deletions
diff --git a/sql-files/main.sql b/sql-files/main.sql
index f67bfd2d8..9e55daf33 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -574,8 +574,7 @@ CREATE TABLE IF NOT EXISTS `ragsrvinfo` (
`name` varchar(255) NOT NULL default '',
`exp` int(11) unsigned NOT NULL default '0',
`jexp` int(11) unsigned NOT NULL default '0',
- `drop` int(11) unsigned NOT NULL default '0',
- `motd` varchar(255) NOT NULL default ''
+ `drop` int(11) unsigned NOT NULL default '0'
) ENGINE=MyISAM;
--
diff --git a/sql-files/upgrade_svn14507.sql b/sql-files/upgrade_svn14507.sql
new file mode 100644
index 000000000..823dee9d8
--- /dev/null
+++ b/sql-files/upgrade_svn14507.sql
@@ -0,0 +1 @@
+DELETE FROM `global_reg_value` WHERE `str` = 'killedrid' OR `str` = 'killerrid';
diff --git a/sql-files/upgrade_svn14579.sql b/sql-files/upgrade_svn14579.sql
new file mode 100644
index 000000000..ad407aa90
--- /dev/null
+++ b/sql-files/upgrade_svn14579.sql
@@ -0,0 +1 @@
+ALTER TABLE `ragsrvinfo` DROP `motd`;