11 Dec
2010
11 Dec
'10
4:24 p.m.
The branch, QA_3_3 has been updated
via b6f717a6025c3785430c4cf317cfa5786564729b (commit)
from 2ba852dc5ca3dc9d2697ee29bd11ad61ab987553 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/sqlparser.data.php | 6 ++----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dca7d9d..9c9b92a 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 5fb1451..b11f956 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
hooks/post-receive
--
phpMyAdmin