r17492 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r17491‎ \| r17492 \| r17493 >
Date:	14:03, 8 November 2006
Author:	brion
Status:	old
Tags:
Comment:	* (bug 6737) Fixes for MySQL 5 schema in strict mode Fixed a field format change for ipb_address which got skipped on the MySQL 5 schema, and switched TYPE= to ENGINE= to suppress annoying warnings
Modified paths:	/trunk/phase3/RELEASE-NOTES (modified) (history) /trunk/phase3/maintenance/mysql5/tables.sql (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/mysql5/tables.sql
—	—	@@ -77,7 +77,7 @@
78	78	-- Password hashes, normally hashed like so:
79	79	-- MD5(CONCAT(user_id,'-',MD5(plaintext_password))), see
80	80	-- wfEncryptPassword() in GlobalFunctions.php
81		~~- user_password tinyblob NOT NULL default '',~~
	81	+ user_password tinyblob NOT NULL,
82	82
83	83	-- When using 'mail me a new password', a random
84	84	-- password is generated and the hash stored here.
—	—	@@ -85,7 +85,7 @@
86	86	-- someone actually logs in with the new password,
87	87	-- at which point the hash is moved to user_password
88	88	-- and the old password is invalidated.
89		~~- user_newpassword tinyblob NOT NULL default '',~~
	89	+ user_newpassword tinyblob NOT NULL,
90	90
91	91	-- Timestamp of the last time when a new password was
92	92	-- sent, for throttling purposes
—	—	@@ -93,11 +93,11 @@
94	94
95	95	-- Note: email should be restricted, not public info.
96	96	-- Same with passwords.
97		~~- user_email tinytext NOT NULL default '',~~
	97	+ user_email tinytext NOT NULL,
98	98
99	99	-- Newline-separated list of name=value defining the user
100	100	-- preferences
101		~~- user_options blob NOT NULL default '',~~
	101	+ user_options blob NOT NULL,
102	102
103	103	-- This is a timestamp which is updated when a user
104	104	-- logs in, logs out, changes preferences, or performs
—	—	@@ -131,7 +131,7 @@
132	132	UNIQUE INDEX user_name (user_name),
133	133	INDEX (user_email_token)
134	134
135		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	135	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
136	136
137	137	--
138	138	-- User permissions have been broken out to a separate table;
—	—	@@ -157,7 +157,7 @@
158	158
159	159	PRIMARY KEY (ug_user,ug_group),
160	160	KEY (ug_group)
161		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	161	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
162	162
163	163	-- Stores notifications of user talk page changes, for the display
164	164	-- of the "you have new messages" box
—	—	@@ -169,7 +169,7 @@
170	170	user_ip varchar(40) NOT NULL default '',
171	171	INDEX user_id (user_id),
172	172	INDEX user_ip (user_ip)
173		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	173	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
174	174
175	175
176	176	--
—	—	@@ -192,7 +192,7 @@
193	193
194	194	-- Comma-separated set of permission keys indicating who
195	195	-- can move or edit the page.
196		~~- page_restrictions tinyblob NOT NULL default '',~~
	196	+ page_restrictions tinyblob NOT NULL,
197	197
198	198	-- Number of times this page has been viewed.
199	199	page_counter bigint(20) unsigned NOT NULL default '0',
—	—	@@ -229,7 +229,7 @@
230	230	INDEX (page_random),
231	231	INDEX (page_len)
232	232
233		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	233	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
234	234
235	235	--
236	236	-- Every edit of a page creates also a revision row.
—	—	@@ -251,7 +251,7 @@
252	252	-- Text comment summarizing the change.
253	253	-- This text is shown in the history and other changes lists,
254	254	-- rendered in a subset of wiki markup by Linker::formatComment()
255		~~- rev_comment tinyblob NOT NULL default '',~~
	255	+ rev_comment tinyblob NOT NULL,
256	256
257	257	-- Key to user.user_id of the user who made this edit.
258	258	-- Stores 0 for anonymous edits and for some mass imports.
—	—	@@ -277,7 +277,7 @@
278	278	INDEX user_timestamp (rev_user,rev_timestamp),
279	279	INDEX usertext_timestamp (rev_user_text,rev_timestamp)
280	280
281		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	281	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
282	282
283	283
284	284	--
—	—	@@ -298,7 +298,7 @@
299	299
300	300	-- Depending on the contents of the old_flags field, the text
301	301	-- may be convenient plain text, or it may be funkily encoded.
302		~~- old_text mediumblob NOT NULL default '',~~
	302	+ old_text mediumblob NOT NULL,
303	303
304	304	-- Comma-separated list of flags:
305	305	-- gzip: text is compressed with PHP's gzdeflate() function.
—	—	@@ -309,11 +309,11 @@
310	310	-- The object either contains multiple versions compressed
311	311	-- together to achieve a better compression ratio, or it refers
312	312	-- to another row where the text can be found.
313		~~- old_flags tinyblob NOT NULL default '',~~
	313	+ old_flags tinyblob NOT NULL,
314	314
315	315	PRIMARY KEY old_id (old_id)
316	316
317		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	317	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
318	318
319	319	--
320	320	-- Holding area for deleted articles, which may be viewed
—	—	@@ -331,17 +331,17 @@
332	332	-- so old archived pages will remain accessible after
333	333	-- upgrading from 1.4 to 1.5.
334	334	-- Text may be gzipped or otherwise funky.
335		~~- ar_text mediumblob NOT NULL default '',~~
	335	+ ar_text mediumblob NOT NULL,
336	336
337	337	-- Basic revision stuff...
338		~~- ar_comment tinyblob NOT NULL default '',~~
	338	+ ar_comment tinyblob NOT NULL,
339	339	ar_user int(5) unsigned NOT NULL default '0',
340	340	ar_user_text varchar(255) binary NOT NULL,
341	341	ar_timestamp char(14) binary NOT NULL default '',
342	342	ar_minor_edit tinyint(1) NOT NULL default '0',
343	343
344	344	-- See ar_text note.
345		~~- ar_flags tinyblob NOT NULL default '',~~
	345	+ ar_flags tinyblob NOT NULL,
346	346
347	347	-- When revisions are deleted, their unique rev_id is stored
348	348	-- here so it can be retained after undeletion. This is necessary
—	—	@@ -365,7 +365,7 @@
366	366
367	367	KEY name_title_timestamp (ar_namespace,ar_title,ar_timestamp)
368	368
369		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	369	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
370	370
371	371
372	372	--
—	—	@@ -385,7 +385,7 @@
386	386	UNIQUE KEY pl_from(pl_from,pl_namespace,pl_title),
387	387	KEY (pl_namespace,pl_title)
388	388
389		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	389	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
390	390
391	391
392	392	--
—	—	@@ -405,7 +405,7 @@
406	406	UNIQUE KEY tl_from(tl_from,tl_namespace,tl_title),
407	407	KEY (tl_namespace,tl_title)
408	408
409		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	409	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
410	410
411	411
412	412	--
—	—	@@ -425,7 +425,7 @@
426	426	UNIQUE KEY il_from(il_from,il_to),
427	427	KEY (il_to)
428	428
429		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	429	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
430	430
431	431	--
432	432	-- Track category inclusions used inline
—	—	@@ -464,7 +464,7 @@
465	465	-- Not really used?
466	466	KEY cl_timestamp(cl_to,cl_timestamp)
467	467
468		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	468	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
469	469
470	470	--
471	471	-- Track links to external URLs
—	—	@@ -474,7 +474,7 @@
475	475	el_from int(8) unsigned NOT NULL default '0',
476	476
477	477	-- The URL
478		~~- el_to blob NOT NULL default '',~~
	478	+ el_to blob NOT NULL,
479	479
480	480	-- In the case of HTTP URLs, this is the URL with any username or password
481	481	-- removed, and with the labels in the hostname reversed and converted to
—	—	@@ -487,12 +487,12 @@
488	488	-- which allows for fast searching for all pages under example.com with the
489	489	-- clause:
490	490	-- WHERE el_index LIKE 'http://com.example.%'
491		~~- el_index blob NOT NULL default '',~~
	491	+ el_index blob NOT NULL,
492	492
493	493	KEY (el_from, el_to(40)),
494	494	KEY (el_to(60), el_from),
495	495	KEY (el_index(60))
496		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	496	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
497	497
498	498	--
499	499	-- Track interlanguage links
—	—	@@ -546,7 +546,7 @@
547	547
548	548	UNIQUE KEY ss_row_id (ss_row_id)
549	549
550		~~-) TYPE=InnoDB;~~
	550	+) ENGINE=InnoDB;
551	551
552	552	--
553	553	-- Stores an ID for every time any article is visited;
—	—	@@ -557,7 +557,7 @@
558	558	--
559	559	CREATE TABLE /$wgDBprefix/hitcounter (
560	560	hc_id INTEGER UNSIGNED NOT NULL
561		~~-) TYPE=HEAP MAX_ROWS=25000;~~
	561	+) ENGINE=HEAP MAX_ROWS=25000;
562	562
563	563
564	564	--
—	—	@@ -569,7 +569,7 @@
570	570	ipb_id int(8) NOT NULL auto_increment,
571	571
572	572	-- Blocked IP address in dotted-quad form or user name.
573		~~- ipb_address varchar(40) binary NOT NULL default '',~~
	573	+ ipb_address tinyblob NOT NULL,
574	574
575	575	-- Blocked user ID or 0 for IP blocks.
576	576	ipb_user int(8) unsigned NOT NULL default '0',
—	—	@@ -578,7 +578,7 @@
579	579	ipb_by int(8) unsigned NOT NULL default '0',
580	580
581	581	-- Text comment made by blocker.
582		~~- ipb_reason tinyblob NOT NULL default '',~~
	582	+ ipb_reason tinyblob NOT NULL,
583	583
584	584	-- Creation (or refresh) date in standard YMDHMS form.
585	585	-- IP blocks expire automatically.
—	—	@@ -617,7 +617,7 @@
618	618	INDEX ipb_timestamp (ipb_timestamp),
619	619	INDEX ipb_expiry (ipb_expiry)
620	620
621		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	621	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
622	622
623	623
624	624	--
—	—	@@ -657,7 +657,7 @@
658	658
659	659	-- Description field as entered by the uploader.
660	660	-- This is displayed in image upload history and logs.
661		~~- img_description tinyblob NOT NULL default '',~~
	661	+ img_description tinyblob NOT NULL,
662	662
663	663	-- user_id and user_name of uploader.
664	664	img_user int(5) unsigned NOT NULL default '0',
—	—	@@ -674,7 +674,7 @@
675	675	-- Used by Special:Newimages and Special:Imagelist
676	676	INDEX img_timestamp (img_timestamp)
677	677
678		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	678	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
679	679
680	680	--
681	681	-- Previous revisions of uploaded files.
—	—	@@ -694,14 +694,14 @@
695	695	oi_width int(5) NOT NULL default 0,
696	696	oi_height int(5) NOT NULL default 0,
697	697	oi_bits int(3) NOT NULL default 0,
698		~~- oi_description tinyblob NOT NULL default '',~~
	698	+ oi_description tinyblob NOT NULL,
699	699	oi_user int(5) unsigned NOT NULL default '0',
700	700	oi_user_text varchar(255) binary NOT NULL default '',
701	701	oi_timestamp char(14) binary NOT NULL default '',
702	702
703	703	INDEX oi_name (oi_name(10))
704	704
705		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	705	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
706	706
707	707
708	708	--
—	—	@@ -743,7 +743,7 @@
744	744	fa_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
745	745	fa_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart") default "unknown",
746	746	fa_minor_mime varchar(32) default "unknown",
747		~~- fa_description tinyblob default '',~~
	747	+ fa_description tinyblob,
748	748	fa_user int(5) unsigned default '0',
749	749	fa_user_text varchar(255) binary default '',
750	750	fa_timestamp char(14) binary default '',
—	—	@@ -754,7 +754,7 @@
755	755	INDEX (fa_deleted_timestamp), -- sort by deletion time
756	756	INDEX (fa_deleted_user) -- sort by deleter
757	757
758		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	758	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
759	759
760	760	--
761	761	-- Primarily a summary table for Special:Recentchanges,
—	—	@@ -819,7 +819,7 @@
820	820	INDEX rc_ip (rc_ip),
821	821	INDEX rc_ns_usertext ( rc_namespace, rc_user_text )
822	822
823		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	823	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
824	824
825	825	CREATE TABLE /$wgDBprefix/watchlist (
826	826	-- Key to user.user_id
—	—	@@ -838,7 +838,7 @@
839	839	UNIQUE KEY (wl_user, wl_namespace, wl_title),
840	840	KEY namespace_title (wl_namespace,wl_title)
841	841
842		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	842	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
843	843
844	844
845	845	--
—	—	@@ -864,7 +864,7 @@
865	865
866	866	UNIQUE KEY math_inputhash (math_inputhash)
867	867
868		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	868	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
869	869
870	870	--
871	871	-- When using the default MySQL search backend, page titles
—	—	@@ -882,13 +882,13 @@
883	883	si_title varchar(255) NOT NULL default '',
884	884
885	885	-- Munged version of body text
886		~~- si_text mediumtext NOT NULL default '',~~
	886	+ si_text mediumtext NOT NULL,
887	887
888	888	UNIQUE KEY (si_page),
889	889	FULLTEXT si_title (si_title),
890	890	FULLTEXT si_text (si_text)
891	891
892		~~-) TYPE=MyISAM, DEFAULT CHARSET=utf8;~~
	892	+) ENGINE=MyISAM, DEFAULT CHARSET=utf8;
893	893
894	894	--
895	895	-- Recognized interwiki link prefixes
—	—	@@ -911,7 +911,7 @@
912	912
913	913	UNIQUE KEY iw_prefix (iw_prefix)
914	914
915		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	915	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
916	916
917	917	--
918	918	-- Used for caching expensive grouped queries
—	—	@@ -929,7 +929,7 @@
930	930
931	931	KEY (qc_type,qc_value)
932	932
933		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	933	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
934	934
935	935	--
936	936	-- For a few generic cache operations if not using Memcached
—	—	@@ -941,7 +941,7 @@
942	942	unique key (keyname),
943	943	key (exptime)
944	944
945		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	945	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
946	946
947	947	--
948	948	-- Cache of interwiki transclusion
—	—	@@ -951,7 +951,7 @@
952	952	tc_contents TEXT,
953	953	tc_time INT NOT NULL,
954	954	UNIQUE INDEX tc_url_idx(tc_url)
955		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	955	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
956	956
957	957	CREATE TABLE /$wgDBprefix/logging (
958	958	-- Symbolic keys for the general log type and the action type
—	—	@@ -975,13 +975,13 @@
976	976	log_comment varchar(255) NOT NULL default '',
977	977
978	978	-- LF separated list of miscellaneous parameters
979		~~- log_params blob NOT NULL default '',~~
	979	+ log_params blob NOT NULL,
980	980
981	981	KEY type_time (log_type, log_timestamp),
982	982	KEY user_time (log_user, log_timestamp),
983	983	KEY page_time (log_namespace, log_title, log_timestamp)
984	984
985		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	985	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
986	986
987	987	CREATE TABLE /$wgDBprefix/trackbacks (
988	988	tb_id integer AUTO_INCREMENT PRIMARY KEY,
—	—	@@ -992,7 +992,7 @@
993	993	tb_name varchar(255),
994	994
995	995	INDEX (tb_page)
996		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	996	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
997	997
998	998	-- Jobs performed by parallel apache threads or a command-line daemon
999	999	CREATE TABLE /$wgDBprefix/job (
—	—	@@ -1008,11 +1008,11 @@
1009	1009
1010	1010	-- Any other parameters to the command
1011	1011	-- Presently unused, format undefined
1012		~~- job_params blob NOT NULL default '',~~
	1012	+ job_params blob NOT NULL,
1013	1013
1014	1014	PRIMARY KEY job_id (job_id),
1015	1015	KEY (job_cmd, job_namespace, job_title)
1016		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	1016	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
1017	1017
1018	1018	-- Details of updates to cached special pages
1019	1019	CREATE TABLE /$wgDBprefix/querycache_info (
—	—	@@ -1026,7 +1026,7 @@
1027	1027
1028	1028	UNIQUE KEY ( qci_type )
1029	1029
1030		~~-) TYPE=InnoDB;~~
	1030	+) ENGINE=InnoDB;
1031	1031
1032	1032	-- For each redirect, this table contains exactly one row defining its target
1033	1033	CREATE TABLE /$wgDBprefix/redirect (
—	—	@@ -1042,7 +1042,7 @@
1043	1043
1044	1044	PRIMARY KEY rd_from (rd_from),
1045	1045	KEY rd_ns_title (rd_namespace,rd_title,rd_from)
1046		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	1046	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
1047	1047
1048	1048	-- Used for caching expensive grouped queries that need two links (for example double-redirects)
1049	1049
—	—	@@ -1065,4 +1065,4 @@
1066	1066	KEY qcc_title (qcc_type,qcc_namespace,qcc_title),
1067	1067	KEY qcc_titletwo (qcc_type,qcc_namespacetwo,qcc_titletwo)
1068	1068
1069		~~-) TYPE=InnoDB, DEFAULT CHARSET=utf8;~~
	1069	+) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
Index: trunk/phase3/RELEASE-NOTES
—	—	@@ -159,6 +159,7 @@
160	160	make CheckUser.php and the new retroactive autoblock functionality faster.
161	161	* Fix regression in Special:Undelete for revisions deleted under MediaWiki 1.4
162	162	with compression or legacy encoding
	163	+* (bug 6737) Fixes for MySQL 5 schema in strict mode
163	164
164	165
165	166	== Languages updated ==