4 files changed, 30 insertions, 28 deletions
diff --git a/sql-files/main.sql b/sql-files/main.sql
index 6f59de4b5..a12e32961 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -427,10 +427,10 @@ CREATE TABLE `login` (
   `email` varchar(39) NOT NULL default '',
   `level` tinyint(3) NOT NULL default '0',
   `error_message` smallint(11) unsigned NOT NULL default '0',
-  `expiration_time` int(11) unsigned NOT NULL default '0',
+  `connect_until` int(11) unsigned NOT NULL default '0',
   `last_ip` varchar(100) NOT NULL default '',
   `memo` smallint(11) unsigned NOT NULL default '0',
-  `unban_time` int(11) unsigned NOT NULL default '0',
+  `ban_until` int(11) unsigned NOT NULL default '0',
   `state` int(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`account_id`),
   KEY `name` (`userid`)
diff --git a/sql-files/upgrade_svn12278.sql b/sql-files/upgrade_svn12278.sql
index 0942904f4..a54353a7b 100644
--- a/sql-files/upgrade_svn12278.sql
+++ b/sql-files/upgrade_svn12278.sql
@@ -1 +1 @@
-DELETE FROM `mail` WHERE `status` > 2;
+DELETE FROM `mail` WHERE `status` > 2;
diff --git a/sql-files/upgrade_svn12294.sql b/sql-files/upgrade_svn12294.sql
index 7405687b3..710b4b7c2 100644
--- a/sql-files/upgrade_svn12294.sql
+++ b/sql-files/upgrade_svn12294.sql
@@ -1,26 +1,26 @@
---
--- Table structure for table `auction`
---
-
-DROP TABLE IF EXISTS `auction`;
-CREATE TABLE `auction` (
-  `auction_id` bigint(20) unsigned NOT NULL auto_increment,
-  `seller_id` int(11) unsigned NOT NULL default '0',
-  `seller_name` varchar(30) NOT NULL default '',
-  `buyer_id` int(11) unsigned NOT NULL default '0',
-  `buyer_name` varchar(30) NOT NULL default '',
-  `price` int(11) unsigned NOT NULL default '0',
-  `buynow` int(11) unsigned NOT NULL default '0',
-  `hours` smallint(6) NOT NULL default '0',
-  `timestamp` int(11) unsigned NOT NULL default '0',
-  `nameid` int(11) unsigned NOT NULL default '0',
-  `item_name` varchar(50) NOT NULL default '',
-  `type` smallint(6) NOT NULL default '0',
-  `refine` tinyint(3) unsigned NOT NULL default '0',
-  `attribute` tinyint(4) unsigned NOT NULL default '0',
-  `card0` smallint(11) NOT NULL default '0',
-  `card1` smallint(11) NOT NULL default '0',
-  `card2` smallint(11) NOT NULL default '0',
-  `card3` smallint(11) NOT NULL default '0',
-  PRIMARY KEY  (`auction_id`)
+--
+-- Table structure for table `auction`
+--
+
+DROP TABLE IF EXISTS `auction`;
+CREATE TABLE `auction` (
+  `auction_id` bigint(20) unsigned NOT NULL auto_increment,
+  `seller_id` int(11) unsigned NOT NULL default '0',
+  `seller_name` varchar(30) NOT NULL default '',
+  `buyer_id` int(11) unsigned NOT NULL default '0',
+  `buyer_name` varchar(30) NOT NULL default '',
+  `price` int(11) unsigned NOT NULL default '0',
+  `buynow` int(11) unsigned NOT NULL default '0',
+  `hours` smallint(6) NOT NULL default '0',
+  `timestamp` int(11) unsigned NOT NULL default '0',
+  `nameid` int(11) unsigned NOT NULL default '0',
+  `item_name` varchar(50) NOT NULL default '',
+  `type` smallint(6) NOT NULL default '0',
+  `refine` tinyint(3) unsigned NOT NULL default '0',
+  `attribute` tinyint(4) unsigned NOT NULL default '0',
+  `card0` smallint(11) NOT NULL default '0',
+  `card1` smallint(11) NOT NULL default '0',
+  `card2` smallint(11) NOT NULL default '0',
+  `card3` smallint(11) NOT NULL default '0',
+  PRIMARY KEY  (`auction_id`)
 ) ENGINE=MyISAM;
 \ No newline at end of file
diff --git a/sql-files/upgrade_svn12561.sql b/sql-files/upgrade_svn12561.sql
new file mode 100644
index 000000000..7d9b0f592
--- /dev/null
+++ b/sql-files/upgrade_svn12561.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `login` CHANGE `expiration_time` `connect_until` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `login` CHANGE `unban_time` `ban_until` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0';