diff --git a/ChangeLog b/ChangeLog index 2187e82b0..457c495af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2961609 [auth] Potential information disclosure at login page - patch #2961540 [export] Do not export data of MERGE table, thanks to Dieter Adriaenssens - ruleant +- bug #2961198 [parser] Querying a table named "data" 3.3.0.0 (not yet released) + rfe #2308632 [edit] Use hex for (var)binary fields, diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 7b29453d9..41bf096c7 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -447,7 +447,6 @@ $PMA_SQPdata_reserved_word = array ( 'CREATE', 'CROSS', 'CURRENT_TIMESTAMP', - 'DATA', 'DATABASE', 'DATABASES', 'DAY', @@ -699,7 +698,7 @@ $PMA_SQPdata_reserved_word = array ( * * @global integer MySQL reserved words count */ -$PMA_SQPdata_reserved_word_cnt = 289; +$PMA_SQPdata_reserved_word_cnt = 288; /** * The previous array must be sorted so that the binary search work. * Sometimes a word is not added in the correct order, so