From 0218c6790dae6dbe1409028f3bb9527b94905a26 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 26 Mar 2006 11:59:12 +0000 Subject: [PATCH] bug #1455373, CONVERT not in reserved words --- ChangeLog | 1 + libraries/sqlparser.data.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 242079d69..89bf1fed6 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $Source$ 2006-03-26 Marc Delisle * sql.php: bug #1448890 Column expander doesn't work * libraries/tbl_properties.inc.php: bug #1458334, undefined offset + * libraries/sqlparser.data.php: bug #1455373, CONVERT in reserved words 2006-03-25 Marc Delisle * db_operations.php, libraries/Table.class.php, diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 3e5819fa1..bc2bd3a16 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -327,6 +327,7 @@ $PMA_SQPdata_reserved_word = array ( 'COMPRESSED', 'CONCURRENT', 'CONSTRAINT', + 'CONVERT', 'CREATE', 'CROSS', 'CURRENT_TIMESTAMP', @@ -564,7 +565,7 @@ $PMA_SQPdata_reserved_word = array ( 'YEAR_MONTH' ); //$PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word); -$PMA_SQPdata_reserved_word_cnt = 273; +$PMA_SQPdata_reserved_word_cnt = 274; // words forbidden to be used as column or table name, // as seen in http://dev.mysql.com/doc/mysql/en/reserved-words.html