Back out r41001 for the moment ("Add log_user_text. Useful for log dumps, which are...

If applied in one piece, it should probably fill in log_user_text... but that would be very slow in production environments.
If it has to be able to work with an online update in production, it should probably allow for a NULL log_user_text value rather than '', which is eery

diff --git a/maintenance/archives/patch-log_user_text.sql b/maintenance/archives/patch-log_user_text.sql
deleted file mode 100644 (file)
index b455b21..0000000
--- a/maintenance/archives/patch-log_user_text.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE /*$wgDBprefix*/logging 
-       ADD log_user_text varchar(255) binary NOT NULL default '';

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 662d03b..d3512c5 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -1076,9 +1076,7 @@ CREATE TABLE /*$wgDBprefix*/logging (
   log_timestamp binary(14) NOT NULL default '19700101000000',
   
   -- The user who performed this action; key to user_id
-  log_user int unsigned NOT NULL default 0, 
-  -- Text username or IP address of the editor.
-  log_user_text varchar(255) binary NOT NULL default '',
+  log_user int unsigned NOT NULL default 0,
   
   -- Key to the page affected. Where a user is the target,
   -- this will point to the user page.

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index dc30dbc..cd12da2 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -145,9 +145,8 @@ $wgMysqlUpdates = array(
        array( 'update_password_format' ),
        
        // 1.14
-       array( 'add_field', 'site_stats',    'ss_active_users',  'patch-ss_active_users.sql' ),
-       array( 'do_active_users_init' ),
-       array( 'add_field', 'logging',       'log_user_text',    'patch-log_user_text.sql' ),
+       array( 'add_field', 'site_stats',     'ss_active_users',  'patch-ss_active_users.sql' ),
+       array( 'do_active_users_init' )
 );