From 71f554728ea4f328031c77e97d7e7dbe6f68513d Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 4 Mar 2007 14:07:42 +0000
Subject: [PATCH] bug #1671403 [parser] using "client" as table name

---
 ChangeLog                    | 4 ++++
 libraries/sqlparser.data.php | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf5121d7b7..876d28ffbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL$
 
+2.10.1
+======
+- bug #1671403 [parser] using "client" as table name
+
 2007-03-02 Marc Delisle  <lem9@users.sourceforge.net>
     * server_status.php: use PMA_getenv('PHP_SELF'), thanks to Sebastian
 
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index 1896fd15f1..b4555108e6 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -400,7 +400,6 @@ $PMA_SQPdata_reserved_word = array (
     'CHARSET',
     'CHECK',
     'CHECKSUM',
-    'CLIENT',
     'COLLATE',
     'COLLATION',
     'COLUMN',
@@ -654,7 +653,7 @@ $PMA_SQPdata_reserved_word = array (
     'YEAR_MONTH'
 );
 //$PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word);
-$PMA_SQPdata_reserved_word_cnt = 280;
+$PMA_SQPdata_reserved_word_cnt = 279;
 
 // words forbidden to be used as column or table name,
 // as seen in http://dev.mysql.com/doc/mysql/en/reserved-words.html
@@ -709,7 +708,6 @@ $PMA_SQPdata_forbidden_word = array (
     'CHECK',
     'CHECKSUM',
     'CIPHER',
-    'CLIENT',
     'CLOSE',
     'COLLATE',
     'COLLATION',
@@ -1145,7 +1143,7 @@ $PMA_SQPdata_forbidden_word = array (
     'ZEROFILL'
 );
 // echo count($PMA_SQPdata_forbidden_word);
-$PMA_SQPdata_forbidden_word_cnt = 484;
+$PMA_SQPdata_forbidden_word_cnt = 483;
 
 $PMA_SQPdata_column_type = array (
     'BIGINT',