Update "phpmyadmin" package to version 4.2.2:

This release contains several improvements and bug fixes. This version
removes support for the deprecated PHP extension "mysql".

Some highlights include:
- Added the ability to save and load queries in Query By Example.
- Navigation tabs are now fixed and don't scroll off screen.
- Easily add a function to all rows when inserting several rows at once.
- Added a favorite tables feature for quick access to often-used tables.
- Quick filter displayed rows.

3 files changed, 395 insertions, 24 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 7645bf6bf5c..e75e8dfab00 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.127 2014/04/28 19:56:40 tron Exp $
+# $NetBSD: Makefile,v 1.128 2014/06/04 20:40:33 tron Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -16,7 +16,6 @@ DEPENDS+=	${PHP_PKG_PREFIX}-zip>=5.3.0:../../archivers/php-zip
 DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=5.3.0:../../archivers/php-zlib
 DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.3.0:../../converters/php-mbstring
 DEPENDS+=	${PHP_PKG_PREFIX}-gettext>=5.3.0:../../devel/php-gettext
-DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=5.3.0:../../databases/php-mysql
 DEPENDS+=	${PHP_PKG_PREFIX}-mysqli>=5.3.0:../../databases/php-mysqli
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.3.0:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=5.3.0:../../security/php-mcrypt
@@ -29,7 +28,7 @@ MESSAGE_SUBST+=	CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \
 		EXDIR=${EXDIR:Q}
 
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=	4.1.14
+DIST_VERSION=	4.2.2
 DOC_FILES=	ChangeLog LICENSE README RELEASE-DATE-${DIST_VERSION}
 
 APACHE_USER?=	www
@@ -56,6 +55,7 @@ INSTALLATION_DIRS+=	${PREFIX}/share/doc/phpmyadmin \
 			${PMDIR} ${PMDIR}/scripts
 
 INSTALL_DIRS=	doc/html
+INSTALL_DIRS+=	doc/html/_static
 INSTALL_DIRS+=	js
 INSTALL_DIRS+=	js/canvg
 INSTALL_DIRS+=	js/jqplot
@@ -73,6 +73,53 @@ INSTALL_DIRS+=	js/jquery/src/jquery
 INSTALL_DIRS+=	js/jquery/src/jquery/ajax
 INSTALL_DIRS+=	js/openlayers
 INSTALL_DIRS+=	js/openlayers/img
+INSTALL_DIRS+=	js/openlayers/src
+INSTALL_DIRS+=	js/openlayers/src/openlayers
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/Firebug
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/Gears
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Control
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Feature
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Filter
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/GML
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Geometry
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Handler
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Lang
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Layer
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMS
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Marker
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Popup
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Protocol
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SQL
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Renderer
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Request
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Strategy
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Tile
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image
+INSTALL_DIRS+=	js/openlayers/src/openlayers/lib/Rico
 INSTALL_DIRS+=	js/openlayers/theme
 INSTALL_DIRS+=	js/openlayers/theme/default
 INSTALL_DIRS+=	js/openlayers/theme/default/img
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index ffd9c6ddf0d..373ef32d747 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2014/02/22 11:14:57 tron Exp $
+@comment $NetBSD: PLIST,v 1.36 2014/06/04 20:40:33 tron Exp $
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/LICENSE
 share/doc/phpmyadmin/README
@@ -31,6 +31,26 @@ share/phpmyadmin/db_sql.php
 share/phpmyadmin/db_structure.php
 share/phpmyadmin/db_tracking.php
 share/phpmyadmin/db_triggers.php
+share/phpmyadmin/doc/html/_static/ajax-loader.gif
+share/phpmyadmin/doc/html/_static/basic.css
+share/phpmyadmin/doc/html/_static/comment-bright.png
+share/phpmyadmin/doc/html/_static/comment-close.png
+share/phpmyadmin/doc/html/_static/comment.png
+share/phpmyadmin/doc/html/_static/default.css
+share/phpmyadmin/doc/html/_static/doctools.js
+share/phpmyadmin/doc/html/_static/down-pressed.png
+share/phpmyadmin/doc/html/_static/down.png
+share/phpmyadmin/doc/html/_static/file.png
+share/phpmyadmin/doc/html/_static/jquery.js
+share/phpmyadmin/doc/html/_static/minus.png
+share/phpmyadmin/doc/html/_static/plus.png
+share/phpmyadmin/doc/html/_static/pygments.css
+share/phpmyadmin/doc/html/_static/searchtools.js
+share/phpmyadmin/doc/html/_static/sidebar.js
+share/phpmyadmin/doc/html/_static/underscore.js
+share/phpmyadmin/doc/html/_static/up-pressed.png
+share/phpmyadmin/doc/html/_static/up.png
+share/phpmyadmin/doc/html/_static/websupport.js
 share/phpmyadmin/doc/html/config.html
 share/phpmyadmin/doc/html/copyright.html
 share/phpmyadmin/doc/html/credits.html
@@ -67,10 +87,12 @@ share/phpmyadmin/js/codemirror/LICENSE
 share/phpmyadmin/js/codemirror/addon/runmode/runmode.js
 share/phpmyadmin/js/codemirror/lib/codemirror.js
 share/phpmyadmin/js/codemirror/mode/sql/sql.js
+share/phpmyadmin/js/columndelete.js
 share/phpmyadmin/js/common.js
 share/phpmyadmin/js/config.js
 share/phpmyadmin/js/cross_framing_protection.js
 share/phpmyadmin/js/db_operations.js
+share/phpmyadmin/js/db_qbe.js
 share/phpmyadmin/js/db_search.js
 share/phpmyadmin/js/db_structure.js
 share/phpmyadmin/js/doclinks.js
@@ -103,13 +125,13 @@ share/phpmyadmin/js/jquery/jquery.cookie.js
 share/phpmyadmin/js/jquery/jquery.debounce-1.0.5.js
 share/phpmyadmin/js/jquery/jquery.event.drag-2.2.js
 share/phpmyadmin/js/jquery/jquery.fullscreen.js
-share/phpmyadmin/js/jquery/jquery.json-2.4.js
 share/phpmyadmin/js/jquery/jquery.menuResizer-1.0.js
 share/phpmyadmin/js/jquery/jquery.mousewheel.js
 share/phpmyadmin/js/jquery/jquery.sortableTable.js
 share/phpmyadmin/js/jquery/jquery.sprintf.js
 share/phpmyadmin/js/jquery/jquery.svg.js
 share/phpmyadmin/js/jquery/jquery.tablesorter.js
+share/phpmyadmin/js/jquery/jquery.uitablefilter.js
 share/phpmyadmin/js/jquery/src/README
 share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.accordion.js
 share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.autocomplete.js
@@ -200,6 +222,299 @@ share/phpmyadmin/js/openlayers/img/zoom-minus-mini.png
 share/phpmyadmin/js/openlayers/img/zoom-plus-mini.png
 share/phpmyadmin/js/openlayers/img/zoom-world-mini.png
 share/phpmyadmin/js/openlayers/img/zoombar.png
+share/phpmyadmin/js/openlayers/src/README
+share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/errorIcon.png
+share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/firebug.css
+share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/firebug.html
+share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/firebug.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/firebugx.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/infoIcon.png
+share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/license.txt
+share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/readme.txt
+share/phpmyadmin/js/openlayers/src/openlayers/lib/Firebug/warningIcon.png
+share/phpmyadmin/js/openlayers/src/openlayers/lib/Gears/gears_init.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Ajax.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Bounds.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Class.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Element.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/LonLat.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Pixel.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Size.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Console.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ArgParser.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Attribution.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Button.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/DragFeature.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/DragPan.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/DrawFeature.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/EditingToolbar.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/GetFeature.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Graticule.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/LayerSwitcher.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Measure.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ModifyFeature.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/MouseDefaults.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/MousePosition.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/MouseToolbar.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/NavToolbar.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Navigation.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/NavigationHistory.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/OverviewMap.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Pan.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanPanel.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanZoom.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanZoomBar.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Panel.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Permalink.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/SLDSelect.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Scale.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ScaleLine.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/SelectFeature.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Snapping.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Split.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/TransformFeature.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/WMSGetFeatureInfo.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/WMTSGetFeatureInfo.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomBox.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomIn.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomOut.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomPanel.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Events.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Feature.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Feature/Vector.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Feature/WFS.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Filter.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Comparison.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Filter/FeatureId.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Logical.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Spatial.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML/Features.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Atom.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain/v2_0_2.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords/v2_0_2.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Context.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_0_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_1_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/Base.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/v2.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/v3.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GPX.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GeoJSON.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GeoRSS.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/JSON.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/KML.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OSM.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_0_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_1_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1_0_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities/v1_0_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetFeatureOfInterest.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetObservation.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Text.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFS.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_1_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSDescribeFeatureType.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_0_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_1_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WKT.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_0_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_1_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer/v1_1.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSGetFeatureInfo.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities/v1_0_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/XML.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Collection.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Curve.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/LineString.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/LinearRing.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiLineString.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPoint.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPolygon.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Point.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Polygon.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Rectangle.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Surface.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Box.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Click.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Drag.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Feature.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Hover.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Keyboard.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/MouseWheel.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Path.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Point.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Polygon.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/RegularPolygon.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Icon.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ar.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/be-tarask.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/bg.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/br.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ca.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/cs-CZ.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/da-DK.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/de.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/el.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/en-CA.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/en.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/es.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fi.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fr.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fur.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/gl.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/gsw.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hr.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hsb.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hu.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ia.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/id.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/io.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/is.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/it.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ja.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/km.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ksh.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nb.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nds.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nl.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nn.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/oc.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pt-BR.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pt.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ru.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/sk.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/sv-SE.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/te.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/vi.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/zh-CN.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/zh-TW.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcGIS93Rest.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcIMS.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Boxes.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/EventPane.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/FixedZoomLevels.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/GML.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/GeoRSS.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google/v3.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Grid.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/HTTPRequest.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Image.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/KaMap.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/KaMapCache.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapGuide.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer/Untiled.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Markers.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MultiMap.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/PointTrack.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/SphericalMercator.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/TMS.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Text.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/TileCache.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector/RootContainer.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/VirtualEarth.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WFS.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMS.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMS/Post.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMTS.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WorldWind.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/XYZ.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Yahoo.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Zoomify.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Map.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Marker.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Marker/Box.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Popup.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Popup/Anchored.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Popup/AnchoredBubble.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Popup/Framed.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Popup/FramedCloud.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Projection.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/HTTP.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS/v1_0_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SQL.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SQL/Gears.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_0_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_1_0.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Renderer.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/Canvas.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/Elements.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/SVG.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/VML.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Request.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Request/XMLHttpRequest.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Rule.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/SingleFile.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/BBOX.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Cluster.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Filter.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Fixed.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Paging.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Refresh.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Save.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Style.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Style2.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/StyleMap.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Line.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Point.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Polygon.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Raster.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Text.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Tile.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image/IFrame.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Tile/WFS.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Tween.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/OpenLayers/Util.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/Rico/Color.js
+share/phpmyadmin/js/openlayers/src/openlayers/lib/Rico/Corner.js
 share/phpmyadmin/js/openlayers/theme/default/framedCloud.css
 share/phpmyadmin/js/openlayers/theme/default/google.css
 share/phpmyadmin/js/openlayers/theme/default/ie6-style.css
@@ -275,6 +590,7 @@ share/phpmyadmin/libraries/DisplayResults.class.php
 share/phpmyadmin/libraries/Error.class.php
 share/phpmyadmin/libraries/Error_Handler.class.php
 share/phpmyadmin/libraries/File.class.php
+share/phpmyadmin/libraries/Font.class.php
 share/phpmyadmin/libraries/Footer.class.php
 share/phpmyadmin/libraries/Header.class.php
 share/phpmyadmin/libraries/Index.class.php
@@ -286,8 +602,9 @@ share/phpmyadmin/libraries/OutputBuffering.class.php
 share/phpmyadmin/libraries/PDF.class.php
 share/phpmyadmin/libraries/PMA.php
 share/phpmyadmin/libraries/Partition.class.php
-share/phpmyadmin/libraries/RecentTable.class.php
+share/phpmyadmin/libraries/RecentFavoriteTable.class.php
 share/phpmyadmin/libraries/Response.class.php
+share/phpmyadmin/libraries/SavedSearches.class.php
 share/phpmyadmin/libraries/Scripts.class.php
 share/phpmyadmin/libraries/ServerStatusData.class.php
 share/phpmyadmin/libraries/StorageEngine.class.php
@@ -321,6 +638,7 @@ share/phpmyadmin/libraries/config/ConfigFile.class.php
 share/phpmyadmin/libraries/config/Form.class.php
 share/phpmyadmin/libraries/config/FormDisplay.class.php
 share/phpmyadmin/libraries/config/FormDisplay.tpl.php
+share/phpmyadmin/libraries/config/ServerConfigChecks.class.php
 share/phpmyadmin/libraries/config/Validator.class.php
 share/phpmyadmin/libraries/config/config_functions.lib.php
 share/phpmyadmin/libraries/config/messages.inc.php
@@ -364,17 +682,18 @@ share/phpmyadmin/libraries/engines/pbxt.lib.php
 share/phpmyadmin/libraries/engines/performance_schema.lib.php
 share/phpmyadmin/libraries/error.inc.php
 share/phpmyadmin/libraries/error_report.lib.php
+share/phpmyadmin/libraries/export.lib.php
 share/phpmyadmin/libraries/file_listing.lib.php
-share/phpmyadmin/libraries/gis/pma_gis_factory.php
-share/phpmyadmin/libraries/gis/pma_gis_geometry.php
-share/phpmyadmin/libraries/gis/pma_gis_geometrycollection.php
-share/phpmyadmin/libraries/gis/pma_gis_linestring.php
-share/phpmyadmin/libraries/gis/pma_gis_multilinestring.php
-share/phpmyadmin/libraries/gis/pma_gis_multipoint.php
-share/phpmyadmin/libraries/gis/pma_gis_multipolygon.php
-share/phpmyadmin/libraries/gis/pma_gis_point.php
-share/phpmyadmin/libraries/gis/pma_gis_polygon.php
-share/phpmyadmin/libraries/gis/pma_gis_visualization.php
+share/phpmyadmin/libraries/gis/GIS_Factory.class.php
+share/phpmyadmin/libraries/gis/GIS_Geometry.class.php
+share/phpmyadmin/libraries/gis/GIS_Geometrycollection.class.php
+share/phpmyadmin/libraries/gis/GIS_Linestring.class.php
+share/phpmyadmin/libraries/gis/GIS_Multilinestring.class.php
+share/phpmyadmin/libraries/gis/GIS_Multipoint.class.php
+share/phpmyadmin/libraries/gis/GIS_Multipolygon.class.php
+share/phpmyadmin/libraries/gis/GIS_Point.class.php
+share/phpmyadmin/libraries/gis/GIS_Polygon.class.php
+share/phpmyadmin/libraries/gis/GIS_Visualization.class.php
 share/phpmyadmin/libraries/iconv_wrapper.lib.php
 share/phpmyadmin/libraries/import.lib.php
 share/phpmyadmin/libraries/index.lib.php
@@ -481,16 +800,17 @@ share/phpmyadmin/libraries/plugins/transformations/Image_PNG_Inline.class.php
 share/phpmyadmin/libraries/plugins/transformations/README
 share/phpmyadmin/libraries/plugins/transformations/TEMPLATE
 share/phpmyadmin/libraries/plugins/transformations/TEMPLATE_ABSTRACT
-share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Append.class.php
+share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Bool2text.class.php
 share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Dateformat.class.php
 share/phpmyadmin/libraries/plugins/transformations/Text_Plain_External.class.php
 share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Formatted.class.php
 share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Imagelink.class.php
 share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Link.class.php
 share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php
+share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Preappend.class.php
 share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Sql.class.php
 share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Substring.class.php
-share/phpmyadmin/libraries/plugins/transformations/abstract/AppendTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/Bool2TextTransformationsPlugin.class.php
 share/phpmyadmin/libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
 share/phpmyadmin/libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php
 share/phpmyadmin/libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php
@@ -499,6 +819,7 @@ share/phpmyadmin/libraries/plugins/transformations/abstract/HexTransformationsPl
 share/phpmyadmin/libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
 share/phpmyadmin/libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php
 share/phpmyadmin/libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/PreApPendTransformationsPlugin.class.php
 share/phpmyadmin/libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php
 share/phpmyadmin/libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
 share/phpmyadmin/libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php
@@ -540,6 +861,7 @@ share/phpmyadmin/libraries/schema/Eps_Relation_Schema.class.php
 share/phpmyadmin/libraries/schema/Export_Relation_Schema.class.php
 share/phpmyadmin/libraries/schema/Pdf_Relation_Schema.class.php
 share/phpmyadmin/libraries/schema/Svg_Relation_Schema.class.php
+share/phpmyadmin/libraries/schema/TableStats.class.php
 share/phpmyadmin/libraries/schema/User_Schema.class.php
 share/phpmyadmin/libraries/select_lang.lib.php
 share/phpmyadmin/libraries/select_server.lib.php
@@ -565,8 +887,6 @@ share/phpmyadmin/libraries/sql.lib.php
 share/phpmyadmin/libraries/sql_query_form.lib.php
 share/phpmyadmin/libraries/sqlparser.data.php
 share/phpmyadmin/libraries/sqlparser.lib.php
-share/phpmyadmin/libraries/sqlvalidator.class.php
-share/phpmyadmin/libraries/sqlvalidator.lib.php
 share/phpmyadmin/libraries/string.inc.php
 share/phpmyadmin/libraries/structure.lib.php
 share/phpmyadmin/libraries/sysinfo.lib.php
@@ -740,6 +1060,7 @@ share/phpmyadmin/themes/original/img/b_engine.png
 share/phpmyadmin/themes/original/img/b_event_add.png
 share/phpmyadmin/themes/original/img/b_events.png
 share/phpmyadmin/themes/original/img/b_export.png
+share/phpmyadmin/themes/original/img/b_favorite.png
 share/phpmyadmin/themes/original/img/b_find_replace.png
 share/phpmyadmin/themes/original/img/b_ftext.png
 share/phpmyadmin/themes/original/img/b_globe.gif
@@ -758,6 +1079,7 @@ share/phpmyadmin/themes/original/img/b_move.png
 share/phpmyadmin/themes/original/img/b_newdb.png
 share/phpmyadmin/themes/original/img/b_newtbl.png
 share/phpmyadmin/themes/original/img/b_nextpage.png
+share/phpmyadmin/themes/original/img/b_no_favorite.png
 share/phpmyadmin/themes/original/img/b_plus.png
 share/phpmyadmin/themes/original/img/b_primary.png
 share/phpmyadmin/themes/original/img/b_print.png
@@ -921,6 +1243,7 @@ share/phpmyadmin/themes/pmahomme/img/b_engine.png
 share/phpmyadmin/themes/pmahomme/img/b_event_add.png
 share/phpmyadmin/themes/pmahomme/img/b_events.png
 share/phpmyadmin/themes/pmahomme/img/b_export.png
+share/phpmyadmin/themes/pmahomme/img/b_favorite.png
 share/phpmyadmin/themes/pmahomme/img/b_find_replace.png
 share/phpmyadmin/themes/pmahomme/img/b_firstpage.png
 share/phpmyadmin/themes/pmahomme/img/b_ftext.png
@@ -941,6 +1264,7 @@ share/phpmyadmin/themes/pmahomme/img/b_move.png
 share/phpmyadmin/themes/pmahomme/img/b_newdb.png
 share/phpmyadmin/themes/pmahomme/img/b_newtbl.png
 share/phpmyadmin/themes/pmahomme/img/b_nextpage.png
+share/phpmyadmin/themes/pmahomme/img/b_no_favorite.png
 share/phpmyadmin/themes/pmahomme/img/b_pdfdoc.png
 share/phpmyadmin/themes/pmahomme/img/b_plus.png
 share/phpmyadmin/themes/pmahomme/img/b_prevpage.png
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 83c3d234068..6379f5884a6 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.84 2014/04/28 19:56:40 tron Exp $
+$NetBSD: distinfo,v 1.85 2014/06/04 20:40:33 tron Exp $
 
-SHA1 (phpMyAdmin-4.1.14-all-languages.tar.xz) = 320b58e586ca7d4fcd86c5dbc3ef23a2a4123a93
-RMD160 (phpMyAdmin-4.1.14-all-languages.tar.xz) = 712a9db8e563aeb400e78e5e1ad67108f73994fa
-Size (phpMyAdmin-4.1.14-all-languages.tar.xz) = 4810240 bytes
+SHA1 (phpMyAdmin-4.2.2-all-languages.tar.xz) = 59661c47d73b8b96fffc4358bc82190c7ae083ea
+RMD160 (phpMyAdmin-4.2.2-all-languages.tar.xz) = 8d42c8a5470a2dc24be6598e514f0193d6d00313
+Size (phpMyAdmin-4.2.2-all-languages.tar.xz) = 5156760 bytes
 SHA1 (patch-libraries_vendor_config.php) = af587496e999bf1e92d6c5a9ab8053fe6e92a0f2