From 1f5896a88b573d511f09e4e7958fcc08b3c33aea Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 11 Dec 2010 07:48:30 -0500 Subject: [PATCH 1/2] Avoid bug entries that relate to a version not yet released --- ChangeLog | 2 -- 1 file changed, 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c21fe3b69..8b795e3d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,8 +124,6 @@ - patch #3112792 [navi] Left panel table grouping incorrect, thanks to garas - garas - bug #3123433 [interface] Avoid double escaping of MySQL errors. -- bug #3119874 [interface] Show integers without decimals on status page. -- bug #3119882 [interface] Display query chart on demand. - [interface] Use less noisy message and remove disable link on server charts and database statistics. 3.3.9.0 (not yet released) From b6f717a6025c3785430c4cf317cfa5786564729b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 11 Dec 2010 08:03:50 -0500 Subject: [PATCH 2/2] bug #3125606 [parser] Query for table "level" causes strange display --- ChangeLog | 1 + libraries/sqlparser.data.php | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dca7d9d66..9c9b92a1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc - bug #3112614 [pdf schema] Scratchboard for PDF pages not working +- bug #3125606 [parser] Query for table "level" causes strange display 3.3.8.1 (2010-11-29) - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 5fb1451df..b11f95612 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -528,7 +528,6 @@ $PMA_SQPdata_reserved_word = array ( 'LAST_INSERT_ID', 'LEADING', 'LEFT', - 'LEVEL', 'LIKE', 'LIMIT', 'LINEAR', // 5.1 @@ -697,7 +696,7 @@ $PMA_SQPdata_reserved_word = array ( * * @global integer MySQL reserved words count */ -$PMA_SQPdata_reserved_word_cnt = 288; +$PMA_SQPdata_reserved_word_cnt = 287; /** * The previous array must be sorted so that the binary search work. * Sometimes a word is not added in the correct order, so @@ -933,7 +932,6 @@ $PMA_SQPdata_forbidden_word = array ( 'LEAVE', 'LEAVES', 'LEFT', - 'LEVEL', 'LIKE', 'LIMIT', 'LINEAR', // 5.1 @@ -1212,7 +1210,7 @@ $PMA_SQPdata_forbidden_word = array ( * * @global integer MySQL forbidden words count */ -$PMA_SQPdata_forbidden_word_cnt = 483; +$PMA_SQPdata_forbidden_word_cnt = 482; /** * the MySQL column/data types