Index: maintenance/mysql5/tables.sql =================================================================== --- maintenance/mysql5/tables.sql (revision 17204) +++ maintenance/mysql5/tables.sql (working copy) @@ -77,7 +77,7 @@ -- Password hashes, normally hashed like so: -- MD5(CONCAT(user_id,'-',MD5(plaintext_password))), see -- wfEncryptPassword() in GlobalFunctions.php - user_password tinyblob NOT NULL default '', + user_password tinyblob NOT NULL, -- When using 'mail me a new password', a random -- password is generated and the hash stored here. @@ -85,15 +85,15 @@ -- someone actually logs in with the new password, -- at which point the hash is moved to user_password -- and the old password is invalidated. - user_newpassword tinyblob NOT NULL default '', + user_newpassword tinyblob NOT NULL, -- Note: email should be restricted, not public info. -- Same with passwords. - user_email tinytext NOT NULL default '', + user_email tinytext NOT NULL, -- Newline-separated list of name=value defining the user -- preferences - user_options blob NOT NULL default '', + user_options blob NOT NULL, -- This is a timestamp which is updated when a user -- logs in, logs out, changes preferences, or performs @@ -188,7 +188,7 @@ -- Comma-separated set of permission keys indicating who -- can move or edit the page. - page_restrictions tinyblob NOT NULL default '', + page_restrictions tinyblob NOT NULL, -- Number of times this page has been viewed. page_counter bigint(20) unsigned NOT NULL default '0', @@ -247,7 +247,7 @@ -- Text comment summarizing the change. -- This text is shown in the history and other changes lists, -- rendered in a subset of wiki markup by Linker::formatComment() - rev_comment tinyblob NOT NULL default '', + rev_comment tinyblob NOT NULL, -- Key to user.user_id of the user who made this edit. -- Stores 0 for anonymous edits and for some mass imports. @@ -294,7 +294,7 @@ -- Depending on the contents of the old_flags field, the text -- may be convenient plain text, or it may be funkily encoded. - old_text mediumblob NOT NULL default '', + old_text mediumblob NOT NULL, -- Comma-separated list of flags: -- gzip: text is compressed with PHP's gzdeflate() function. @@ -305,7 +305,7 @@ -- The object either contains multiple versions compressed -- together to achieve a better compression ratio, or it refers -- to another row where the text can be found. - old_flags tinyblob NOT NULL default '', + old_flags tinyblob NOT NULL, PRIMARY KEY old_id (old_id) @@ -327,17 +327,17 @@ -- so old archived pages will remain accessible after -- upgrading from 1.4 to 1.5. -- Text may be gzipped or otherwise funky. - ar_text mediumblob NOT NULL default '', + ar_text mediumblob NOT NULL, -- Basic revision stuff... - ar_comment tinyblob NOT NULL default '', + ar_comment tinyblob NOT NULL, ar_user int(5) unsigned NOT NULL default '0', ar_user_text varchar(255) binary NOT NULL, ar_timestamp char(14) binary NOT NULL default '', ar_minor_edit tinyint(1) NOT NULL default '0', -- See ar_text note. - ar_flags tinyblob NOT NULL default '', + ar_flags tinyblob NOT NULL, -- When revisions are deleted, their unique rev_id is stored -- here so it can be retained after undeletion. This is necessary @@ -470,7 +470,7 @@ el_from int(8) unsigned NOT NULL default '0', -- The URL - el_to blob NOT NULL default '', + el_to blob NOT NULL, -- In the case of HTTP URLs, this is the URL with any username or password -- removed, and with the labels in the hostname reversed and converted to @@ -483,7 +483,7 @@ -- which allows for fast searching for all pages under example.com with the -- clause: -- WHERE el_index LIKE 'http://com.example.%' - el_index blob NOT NULL default '', + el_index blob NOT NULL, KEY (el_from, el_to(40)), KEY (el_to(60), el_from), @@ -574,7 +574,7 @@ ipb_by int(8) unsigned NOT NULL default '0', -- Text comment made by blocker. - ipb_reason tinyblob NOT NULL default '', + ipb_reason tinyblob NOT NULL, -- Creation (or refresh) date in standard YMDHMS form. -- IP blocks expire automatically. @@ -650,7 +650,7 @@ -- Description field as entered by the uploader. -- This is displayed in image upload history and logs. - img_description tinyblob NOT NULL default '', + img_description tinyblob NOT NULL, -- user_id and user_name of uploader. img_user int(5) unsigned NOT NULL default '0', @@ -687,7 +687,7 @@ oi_width int(5) NOT NULL default 0, oi_height int(5) NOT NULL default 0, oi_bits int(3) NOT NULL default 0, - oi_description tinyblob NOT NULL default '', + oi_description tinyblob NOT NULL, oi_user int(5) unsigned NOT NULL default '0', oi_user_text varchar(255) binary NOT NULL default '', oi_timestamp char(14) binary NOT NULL default '', @@ -736,7 +736,7 @@ fa_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL, fa_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart") default "unknown", fa_minor_mime varchar(32) default "unknown", - fa_description tinyblob default '', + fa_description tinyblob, fa_user int(5) unsigned default '0', fa_user_text varchar(255) binary default '', fa_timestamp char(14) binary default '', @@ -875,7 +875,7 @@ si_title varchar(255) NOT NULL default '', -- Munged version of body text - si_text mediumtext NOT NULL default '', + si_text mediumtext NOT NULL, UNIQUE KEY (si_page), FULLTEXT si_title (si_title), @@ -968,7 +968,7 @@ log_comment varchar(255) NOT NULL default '', -- LF separated list of miscellaneous parameters - log_params blob NOT NULL default '', + log_params blob NOT NULL, KEY type_time (log_type, log_timestamp), KEY user_time (log_user, log_timestamp), @@ -1001,7 +1001,7 @@ -- Any other parameters to the command -- Presently unused, format undefined - job_params blob NOT NULL default '', + job_params blob NOT NULL, PRIMARY KEY job_id (job_id), KEY (job_cmd, job_namespace, job_title)