[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24863-g1629008

[Michal Čihař]

The branch, master has been updated
       via  16290082b6fe75e3a473b4e9b0f7db3076ea801b (commit)
       via  eafecac2e85d508d88d2c6f36e4b8a830d85956e (commit)
      from  6adcae41645646f1ff1ee7d44102449f37d4b7d9 (commit)


- Log -----------------------------------------------------------------
commit 16290082b6fe75e3a473b4e9b0f7db3076ea801b
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Dec 16 15:15:04 2011 +0100

    Update reference

commit eafecac2e85d508d88d2c6f36e4b8a830d85956e
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Dec 16 15:14:33 2011 +0100

    Add MySQL 5.5 reserved words

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

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

diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index 319fa63..51ec346 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -367,7 +367,7 @@ $PMA_SQPdata_column_attrib = array (
 /**
  * words that are reserved by MySQL and may not be used as identifiers without quotes
  *
- * @see http://dev.mysql.com/doc/refman/5.1/en/reserved-words.html
+ * @see http://dev.mysql.com/doc/refman/5.5/en/reserved-words.html
  *
  * @global array MySQL reserved words
  */
@@ -465,6 +465,7 @@ $PMA_SQPdata_reserved_word = array (
     'FULL',
     'FULLTEXT',
     'FUNCTION',
+    'GENERAL',
     'GEMINI',
     'GEMINI_SPIN_RETRIES',
     'GLOBAL',
@@ -481,6 +482,7 @@ $PMA_SQPdata_reserved_word = array (
     'IDENTIFIED',
     'IF',
     'IGNORE',
+    'IGNORE_SERVER_IDS',
     'IN',
     'INDEX',
     'INDEXES',
@@ -513,6 +515,7 @@ $PMA_SQPdata_reserved_word = array (
     'LOW_PRIORITY',
     'MARIA',                // 5.1 ?
     'MASTER_CONNECT_RETRY',
+    'MASTER_HEARTBEAT_PERIOD',
     'MASTER_HOST',
     'MASTER_LOG_FILE',
     'MASTER_LOG_POS',
@@ -520,6 +523,7 @@ $PMA_SQPdata_reserved_word = array (
     'MASTER_PORT',
     'MASTER_USER',
     'MATCH',
+    'MAXVALUE',
     'MAX_CONNECTIONS_PER_HOUR',
     'MAX_QUERIES_PER_HOUR',
     'MAX_ROWS',
@@ -582,6 +586,7 @@ $PMA_SQPdata_reserved_word = array (
     'REPLACE',
     'REPLICATION',
     'RESET',
+    'RESIGNAL',
     'RESTORE',
     'RESTRICT',
     'RETURN',
@@ -602,7 +607,9 @@ $PMA_SQPdata_reserved_word = array (
     'SHARE',
     'SHOW',
     'SHUTDOWN',
+    'SIGNAL',
     'SLAVE',
+    'SLOW',
     'SONAME',
     'SOUNDS',                   // string-functions.html
     'SQL',


hooks/post-receive
-- 
phpMyAdmin