Cleanup for r50567:

* Include DB table options on log_search table creation
* Adjust tabs->spaces in table def... sounds silly, but the tabs sometimes confuse things when cut-and-pasting into mysql command line. :)

diff --git a/maintenance/archives/patch-log_search.sql b/maintenance/archives/patch-log_search.sql
index 2c2cd0e..e396330 100644 (file)
--- a/maintenance/archives/patch-log_search.sql
+++ b/maintenance/archives/patch-log_search.sql
@@ -1,10 +1,10 @@
 CREATE TABLE /*_*/log_search (
-       -- The type of ID (rev ID, log ID, rev timestamp, username)
-       ls_field varbinary(32) NOT NULL,
-       -- The value of the ID
-       ls_value varchar(255) NOT NULL,
-       -- Key to log_id
-       ls_log_id int unsigned NOT NULL default 0,
-       PRIMARY KEY (ls_field,ls_value,ls_log_id)
-);
+  -- The type of ID (rev ID, log ID, rev timestamp, username)
+  ls_field varbinary(32) NOT NULL,
+  -- The value of the ID
+  ls_value varchar(255) NOT NULL,
+  -- Key to log_id
+  ls_log_id int unsigned NOT NULL default 0,
+  PRIMARY KEY (ls_field,ls_value,ls_log_id)
+) /*$wgDBTableOptions*/;
 CREATE INDEX /*i*/ls_log_id ON /*_*/log_search (ls_log_id);

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 101a177..9ce2380 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -1125,14 +1125,14 @@ CREATE INDEX /*i*/times ON /*_*/logging (log_timestamp);
 
 
 CREATE TABLE /*_*/log_search (
-       -- The type of ID (rev ID, log ID, rev timestamp, username)
-       ls_field varbinary(32) NOT NULL,
-       -- The value of the ID
-       ls_value varchar(255) NOT NULL,
-       -- Key to log_id
-       ls_log_id int unsigned NOT NULL default 0,
-       PRIMARY KEY (ls_field,ls_value,ls_log_id)
-);
+  -- The type of ID (rev ID, log ID, rev timestamp, username)
+  ls_field varbinary(32) NOT NULL,
+  -- The value of the ID
+  ls_value varchar(255) NOT NULL,
+  -- Key to log_id
+  ls_log_id int unsigned NOT NULL default 0,
+  PRIMARY KEY (ls_field,ls_value,ls_log_id)
+) /*$wgDBTableOptions*/;
 CREATE INDEX /*i*/ls_log_id ON /*_*/log_search (ls_log_id);