From 6096ce0b42a3eee07dc70ae5ef489aa4c30bf515 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sun, 26 Dec 2010 22:36:41 +0000 Subject: * 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 --- sql-files/main.sql | 3 +-- sql-files/upgrade_svn14507.sql | 1 + sql-files/upgrade_svn14579.sql | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 sql-files/upgrade_svn14507.sql create mode 100644 sql-files/upgrade_svn14579.sql (limited to 'sql-files') 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`; -- cgit v1.2.3-70-g09d2