[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2965-g8d07c5b

[Marc Delisle]

The branch, master has been updated
       via  8d07c5bd77f86e65843248d31ccfa7d4d28a6586 (commit)
       via  60089624dd6fdf1e31a05c551e4c78c21d06fb9d (commit)
      from  8ae25cd89a1f0836c5ad5c4e642ee8ecc9dc06ba (commit)


- Log -----------------------------------------------------------------
commit 8d07c5bd77f86e65843248d31ccfa7d4d28a6586
Merge: 8ae25cd89a1f0836c5ad5c4e642ee8ecc9dc06ba 60089624dd6fdf1e31a05c551e4c78c21d06fb9d
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Jun 4 06:39:24 2011 -0400

    Merge branch 'QA_3_4'

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

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

diff --git a/ChangeLog b/ChangeLog
index be1d37d..86756d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
 3.4.3.0 (not yet released)
 - bug #3311170 [sync] Missing helper icons in Synchronize
 - patch #3304473 [setup] Redefine a lable that was wrong
+- bug #3304544 [parser] master is not a reserved word
 
 3.4.2.0 (not yet released)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index e8a3115..c7dacc6 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -527,7 +527,6 @@ $PMA_SQPdata_reserved_word = array (
     'LOGS',
     'LOW_PRIORITY',
     'MARIA',                // 5.1 ?
-    'MASTER',
     'MASTER_CONNECT_RETRY',
     'MASTER_HOST',
     'MASTER_LOG_FILE',
@@ -685,7 +684,7 @@ $PMA_SQPdata_reserved_word = array (
  *
  * @global integer MySQL reserved words count
  */
-$PMA_SQPdata_reserved_word_cnt = 288;
+$PMA_SQPdata_reserved_word_cnt = 287;
 
 /**
  * words forbidden to be used as column or table name wihtout quotes


hooks/post-receive
-- 
phpMyAdmin