From ca18fad776bd845fff3db5d3381434a7384e24d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Sch=C3=B6nberger?= <mad05@users.sourceforge.net>
Date: Mon, 30 Aug 2010 10:07:11 -0400
Subject: [PATCH 1/2] improved patch

---
 pdf_pages.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pdf_pages.php b/pdf_pages.php
index 7b0d6a859..4ec060132 100644
--- a/pdf_pages.php
+++ b/pdf_pages.php
@@ -326,6 +326,7 @@ $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) .
 $page_rs    = PMA_query_as_controluser($page_query, FALSE, $query_default_option);
 $array_sh_page = array();
 $draginit = '';
+$draginit2 = '';
 $reset_draginit = '';
 $i = 0;
 while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) {
@@ -349,7 +350,7 @@ foreach ($array_sh_page AS $key => $temp_sh_page) {
     $drag_x = $temp_sh_page['x'];
     $drag_y = $temp_sh_page['y'];
 
-    $draginit2 = ' Drag.init(getElement("table_' . $i . '"), null, 0, parseInt(myid.style.width)-2, 0, parseInt(myid.style.height)-5);' . "\n";
+    $draginit2      .= ' Drag.init(getElement("table_' . $i . '"), null, 0, parseInt(myid.style.width)-2, 0, parseInt(myid.style.height)-5);' . "\n";
     $draginit       .= '    getElement("table_' . $i . '").onDrag = function (x, y) { document.edcoord.elements["c_table_' . $i . '[x]"].value = parseInt(x); document.edcoord.elements["c_table_' . $i . '[y]"].value = parseInt(y) }' . "\n";
     $draginit       .= '    getElement("table_' . $i . '").style.left = "' . $drag_x . 'px";' . "\n";
     $draginit       .= '    getElement("table_' . $i . '").style.top  = "' . $drag_y . 'px";' . "\n";

From 061b87f11f09633fbfe21d8c35f520ca9b80ff60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Mon, 30 Aug 2010 17:23:50 +0200
Subject: [PATCH 2/2] bug #3035300 [parser] Fixed wrong definition of keywords.

---
 ChangeLog                    | 1 +
 libraries/sqlparser.data.php | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83ee862eb..da27bea82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after
   a page size increase, thanks to Martin Schönberger - mad05
 - bug #3054458 [core] Fixed displaying number of rows.
+- bug #3035300 [parser] Fixed wrong definition of keywords.
 
 3.3.6.0 (2010-08-28)
 - bug #3033063 [core] Navi gets wrong db name
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index 41bf096c7..5fb1451df 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -211,7 +211,6 @@ $PMA_SQPdata_function_name = array (
     'MOD',
     'MONTH',
     'MONTHNAME',
-    'NOW',
     'MPOINTFROMTEXT',           // MPointFromText()
     'MPOINTFROMWKB',            // MPointFromWKB()
     'MPOLYFROMTEXT',            // MPolyFromText()
@@ -339,7 +338,7 @@ $PMA_SQPdata_function_name = array (
  *
  * @global integer MySQL attributes count
  */
-$PMA_SQPdata_function_name_cnt = 299;
+$PMA_SQPdata_function_name_cnt = 298;
 
 /*
  * DEBUG
@@ -1047,9 +1046,9 @@ $PMA_SQPdata_forbidden_word = array (
     'RAID_TYPE',
     'RANGE',                // 5.1
     'READ',
+    'READS',
     'READ_ONLY',            // 5.1
     'READ_WRITE',           // 5.1
-    'READS',
     'REAL',
     'RECOVER',
     'REDUNDANT',