[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7-11-gd22fae4

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  d22fae4201f299d4f3fcac1ac4bc136a422c5d26 (commit)
      from  0b24e6943505fad97e7fba3263bf863cdb7c01dd (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

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

diff --git a/ChangeLog b/ChangeLog
index 8a3bba9..e59ea1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 - bug #3430377 [interface] Deleted search results remain visible
 - bug #3428627 [import] ODS import ignores memory limits
 - bug #3426836 [interface] Visual column separation
+- bug #3428065 [parser] TRUE not recognized by parser
 
 3.4.7.0 (2011-10-23)
 - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index c7dacc6..9f2ea12 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -657,6 +657,7 @@ $PMA_SQPdata_reserved_word = array (
     'TO',
     'TRAILING',
     'TRANSACTIONAL',    // 5.1 ?
+    'TRUE',
     'TRUNCATE',
     'TYPE',
     'TYPES',
@@ -684,7 +685,7 @@ $PMA_SQPdata_reserved_word = array (
  *
  * @global integer MySQL reserved words count
  */
-$PMA_SQPdata_reserved_word_cnt = 287;
+$PMA_SQPdata_reserved_word_cnt = 288;
 
 /**
  * words forbidden to be used as column or table name wihtout quotes


hooks/post-receive
-- 
phpMyAdmin