# HG changeset patch
# User Dan
# Date 1203044224 18000
# Node ID 990ccfb20120260e22cc04df5150205623857f87
# Parent  dbae4d32784631bdc2a26ff14b9af8cd413054e1# Parent  ca37fcd08c4e7fbe46bc2910113bb97f475e5669
Merging changes from scribus

diff -r dbae4d327846 -r 990ccfb20120 install/schemas/mysql_stage2.sql
--- a/install/schemas/mysql_stage2.sql	Wed Feb 13 23:16:33 2008 -0500
+++ b/install/schemas/mysql_stage2.sql	Thu Feb 14 21:57:04 2008 -0500
@@ -248,7 +248,7 @@
   tag_name varchar(63) NOT NULL DEFAULT 'bla',
   page_id varchar(255) NOT NULL,
   namespace varchar(255) NOT NULL,
-  user mediumint(8) NOT NULL DEFAULT 1,
+  user_id mediumint(8) NOT NULL DEFAULT 1,
   PRIMARY KEY ( tag_id )
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
diff -r dbae4d327846 -r 990ccfb20120 install/schemas/upgrade/1.1.1-1.1.2-mysql.sql
--- a/install/schemas/upgrade/1.1.1-1.1.2-mysql.sql	Wed Feb 13 23:16:33 2008 -0500
+++ b/install/schemas/upgrade/1.1.1-1.1.2-mysql.sql	Thu Feb 14 21:57:04 2008 -0500
@@ -7,6 +7,8 @@
 ALTER TABLE {{TABLE_PREFIX}}users ADD COLUMN user_rank int(12) UNSIGNED NOT NULL DEFAULT 1,
                                   ADD COLUMN user_timezone int(12) UNSIGNED NOT NULL DEFAULT 0;
 
+ALTER TABLE {{TABLE_PREFIX}}tags CHANGE user user_id mediumint(8) NOT NULL DEFAULT 1;
+
 CREATE TABLE {{TABLE_PREFIX}}ranks(
   rank_id int(12) NOT NULL auto_increment,
   rank_title varchar(63) NOT NULL DEFAULT '',