Merge remote-tracking branch 'origin/master' into drizzle

Conflicts:
	db_structure.php
	libraries/common.lib.php
	libraries/database_interface.lib.php
	tbl_structure.php

ChangeLog

@@ -20,6 +20,15 @@ phpMyAdmin - ChangeLog
 + [interface] Mouse-based column reordering in query results
 + AJAX for Insert to a table from database Structure page
 - Patch #3316969 PMA_ajaxShowMessage() does not respect timeout
++ AJAX for Change on multiple rows in table Browse
++ [interface] Improved support for stored routines
++ [display] More options for browsing GIS data
++ [interface] Support for spatial indexes
++ [display] GIS data visualization
+
+3.4.4.0 (not yet released)
+- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
+- bug #3323101 [parser] Invalid escape sequence in SQL parser
 
 3.4.3.0 (not yet released)
 - bug #3311170 [sync] Missing helper icons in Synchronize
@@ -34,6 +43,7 @@ phpMyAdmin - ChangeLog
 - patch #3317206 [privileges] Generate password option missing on new accounts
 - bug #3317293 [edit] Inline edit places HTML line breaks in edit area
 - bug #3319466 [interface] Inline query edit does not escape special characters
+- minor XSS (require a valid token)
 
 3.4.2.0 (2011-06-07)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label

Documentation.html

@@ -137,6 +137,8 @@ <h3>Currently phpMyAdmin can:</h3>
         <abbr title="Frequently Asked Questions">FAQ</abbr> 3.6)</a></li>
     <li>support mysqli, the improved MySQL extension <a href="#faq1_17">
         (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17)</a></li>
+    <li>create, edit, call, export and drop stored procedures and functions</li>
+    <li>create, edit, export and drop events and triggers</li>
     <li>communicate in <a href="http://www.phpmyadmin.net/home_page/translations.php">62 different languages</a>
         </li>
     <li>synchronize two databases residing on the same as well as remote servers
@@ -5153,6 +5155,8 @@ <h2 id="glossary">Glossary</h2>
     <li><a href="http://www.wikipedia.org/wiki/Secure_Sockets_Layer">SSL (Secure
             Sockets Layer)</a>
          - a cryptographic protocol which provides secure communication on the Internet.</li>
+    <li><a href="http://en.wikipedia.org/wiki/Stored_procedure">Stored procedure</a>
+         - a subroutine available to applications accessing a relational database system</li>
     <li><a href="http://www.wikipedia.org/wiki/SQL">SQL</a>
          - Structured Query Language</li>
     <li><a href="http://www.wikipedia.org/wiki/Table_%28database%29">table</a>
@@ -5164,6 +5168,9 @@ <h2 id="glossary">Glossary</h2>
          - a type of archive file format: the Tape ARchive format.</li>
     <li><a href="http://www.wikipedia.org/wiki/TCP">TCP (Transmission Control Protocol)</a>
          - one of the core protocols of the Internet protocol suite.</li>
+    <li><a href="http://en.wikipedia.org/wiki/Database_trigger">trigger</a>
+         - a procedural code that is automatically executed in response to
+         certain events on a particular table or view in a database</li>
     <li><a href="http://www.acko.net/node/56">UFPDF</a>
         - Unicode/UTF-8 extension for FPDF</li>
     <li><a href="http://www.wikipedia.org/wiki/URL">URL (Uniform Resource Locator)</a>

db_events.php

@@ -0,0 +1,38 @@
+<?php
+
+/**
+ *
+ */
+require_once './libraries/common.inc.php';
+require_once './libraries/common.lib.php';
+
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'db_events.js';
+
+/**
+ * Create labels for the list
+ */
+$titles = PMA_buildActionTitles();
+
+/**
+ * Displays the header
+ */
+require_once './libraries/db_common.inc.php';
+
+/**
+ * Displays the tabs
+ */
+require_once './libraries/db_info.inc.php';
+
+/**
+ * Displays the list of events
+ */
+require_once './libraries/db_events.inc.php';
+
+/**
+ * Displays the footer
+ */
+require './libraries/footer.inc.php';
+
+
+?>

db_printview.php

@@ -53,7 +53,7 @@
             if ($result != false && PMA_DBI_num_rows($result) > 0) {
                 while ($tmp = PMA_DBI_fetch_row($result)) {
                     if (! isset($sot_cache[$tmp[0]])) {
-                        $sts_result  = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . addslashes($tmp[0]) . '\';');
+                        $sts_result  = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($tmp[0]) . '\';');
                         $sts_tmp     = PMA_DBI_fetch_assoc($sts_result);
                         $tables[]    = $sts_tmp;
                     } else { // table in use