[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2RC1-8-g6008962
Marc Delisle
lem9 at users.sourceforge.net
Sat Jun 4 12:41:03 CEST 2011
The branch, QA_3_4 has been updated
via 60089624dd6fdf1e31a05c551e4c78c21d06fb9d (commit)
from 2bdfe069826caf9d4f5c82cfbb2a71b6990b976d (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/sqlparser.data.php | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2fb8151..8226ad5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,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
More information about the Git
mailing list