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

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

diff --git a/ChangeLog b/ChangeLog
index 8f9832a14..239ac5a42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,14 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL$
 
-2007-03-02 Marc Delisle  <lem9@users.sourceforge.net>
-    * server_status.php: use PMA_getenv('PHP_SELF'), thanks to Sebastian
+2.11
+====
+- bug #1671403 [parser] using "client" as table name
+. [general] use PMA_getenv('PHP_SELF')
+. [config] set $cfg['Servers'][$i]['ssl'] default value to false, 
+   we got reports from some users having problems with the default value of true
+- bug #1659176 [general] memory error displaying a table with large BLOBs
+- bug #1668662 [install] can create the new pma_designer_coords table
 
 2007-03-02 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/common.lib.php: bug #1672379 Call to undefined function PMA_removeCookie()
@@ -14,19 +20,6 @@ $HeadURL$
 2007-03-01 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/common.lib.php: bug #1671813 CVE-2006-1549 deep recursion crash
 
-2007-02-28 Marc Delisle  <lem9@users.sourceforge.net>
-    * libraries/config.default.php: set $cfg['Servers'][$i]['ssl'] default
-      value to false, we got reports from some users having problems with the
-      default value of true
-
-2007-02-27 Marc Delisle  <lem9@users.sourceforge.net>
-    * libraries/common.lib.php: bug #1659176, memory error displaying
-      a table with large BLOBs
-
-2007-02-26 Marc Delisle  <lem9@users.sourceforge.net>
-    * scripts/upgrade_tables_mysql_4_1_2+.sql: bug #1668662,
-      can create the new pma_designer_coords table
-
 2007-02-25 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php: bug #1667466, undefined variable when
       export + save on server
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index 54084c720..037b3a0c2 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -423,7 +423,6 @@ $PMA_SQPdata_reserved_word = array (
     'CHARSET',
     'CHECK',
     'CHECKSUM',
-    'CLIENT',
     'COLLATE',
     'COLLATION',
     'COLUMN',
@@ -681,7 +680,7 @@ $PMA_SQPdata_reserved_word = array (
  *
  * @global integer MySQL reserved words count
  */
-$PMA_SQPdata_reserved_word_cnt = 280;
+$PMA_SQPdata_reserved_word_cnt = 279;
 
 /**
  * words forbidden to be used as column or table name wihtout quotes
@@ -740,7 +739,6 @@ $PMA_SQPdata_forbidden_word = array (
     'CHECK',
     'CHECKSUM',
     'CIPHER',
-    'CLIENT',
     'CLOSE',
     'COLLATE',
     'COLLATION',
@@ -1180,7 +1178,7 @@ $PMA_SQPdata_forbidden_word = array (
  *
  * @global integer MySQL forbidden words count
  */
-$PMA_SQPdata_forbidden_word_cnt = 484;
+$PMA_SQPdata_forbidden_word_cnt = 483;
 
 /**
  * the MySQL column/data types