The branch, QA_3_3 has been updated via 061b87f11f09633fbfe21d8c35f520ca9b80ff60 (commit) from ca18fad776bd845fff3db5d3381434a7384e24d5 (commit)
- Log ----------------------------------------------------------------- -----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/sqlparser.data.php | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 83ee862..da27bea 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 41bf096..5fb1451 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',
hooks/post-receive