summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--sql-files/upgrade_svn12975_view.sql4
2 files changed, 5 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index db1b19020..365cb6ed4 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2008/07/29
+ * Corrected upgrade_svn12975_view.sql not assigning default values
+ to the two dummy columns; please drop the view and re-run the script.
2008/07/27
* Fixed md5 passwords not working
* Possibly corrected a guild saving problem (bugreport:1908)
diff --git a/sql-files/upgrade_svn12975_view.sql b/sql-files/upgrade_svn12975_view.sql
index 8d5d5906b..a3d64f97e 100644
--- a/sql-files/upgrade_svn12975_view.sql
+++ b/sql-files/upgrade_svn12975_view.sql
@@ -8,8 +8,8 @@
START TRANSACTION;
-- create dummy columns, needed to make the view insertable
-ALTER TABLE `login` ADD `error_message` SMALLINT UNSIGNED NOT NULL;
-ALTER TABLE `login` ADD `memo` SMALLINT UNSIGNED NOT NULL;
+ALTER TABLE `login` ADD `error_message` SMALLINT UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `login` ADD `memo` SMALLINT UNSIGNED NOT NULL DEFAULT '0';
-- create the view
CREATE VIEW `login_view` ( `account_id`, `userid`, `user_pass`, `lastlogin`, `sex`, `logincount`, `email`, `level`, `error_message`, `connect_until`, `last_ip`, `memo`, `ban_until`, `state` ) AS SELECT `account_id`, `userid`, `user_pass`, `lastlogin`, `sex`, `logincount`, `email`, `level`, `error_message`, `expiration_time`, `last_ip`, `memo`, `unban_time`, `state` FROM `login`;