[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-22130-g0b16d69

Marc Delisle lem9 at users.sourceforge.net
Wed Nov 2 17:42:24 CET 2011


The branch, master has been updated
       via  0b16d690d2e0119f5a5f80661701d3d4913f20b5 (commit)
       via  d22fae4201f299d4f3fcac1ac4bc136a422c5d26 (commit)
      from  0ac705dc92fb7858d5697761882e35eff599bc8a (commit)


- Log -----------------------------------------------------------------
commit 0b16d690d2e0119f5a5f80661701d3d4913f20b5
Merge: 0ac705d d22fae4
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Nov 2 12:41:13 2011 -0400

    Fix merge conflicts

-----------------------------------------------------------------------

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

diff --git a/ChangeLog b/ChangeLog
index d830787..2eb1eb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,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 9829c3a..0a86784 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -641,6 +641,7 @@ $PMA_SQPdata_reserved_word = array (
     'TO',
     'TRAILING',
     'TRANSACTIONAL',    // 5.1 ?
+    'TRUE',
     'TRUNCATE',
     'TYPE',
     'TYPES',


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list