diff --git a/ChangeLog b/ChangeLog index c21fe3b69..a804ef87e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,8 +124,6 @@ - patch #3112792 [navi] Left panel table grouping incorrect, thanks to garas - garas - bug #3123433 [interface] Avoid double escaping of MySQL errors. -- bug #3119874 [interface] Show integers without decimals on status page. -- bug #3119882 [interface] Display query chart on demand. - [interface] Use less noisy message and remove disable link on server charts and database statistics. 3.3.9.0 (not yet released) @@ -137,6 +135,7 @@ - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc - bug #3112614 [pdf schema] Scratchboard for PDF pages not working +- bug #3125606 [parser] Query for table "level" causes strange display 3.3.8.1 (2010-11-29) - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index dffd6b166..e8a311581 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -516,7 +516,6 @@ $PMA_SQPdata_reserved_word = array ( 'LAST_INSERT_ID', 'LEADING', 'LEFT', - 'LEVEL', 'LIKE', 'LIMIT', 'LINEAR', // 5.1 @@ -686,7 +685,7 @@ $PMA_SQPdata_reserved_word = array ( * * @global integer MySQL reserved words count */ -$PMA_SQPdata_reserved_word_cnt = 289; +$PMA_SQPdata_reserved_word_cnt = 288; /** * words forbidden to be used as column or table name wihtout quotes @@ -905,7 +904,6 @@ $PMA_SQPdata_forbidden_word = array ( 'LEAVE', 'LEAVES', 'LEFT', - 'LEVEL', 'LIKE', 'LIMIT', 'LINEAR', // 5.1 @@ -1184,7 +1182,7 @@ $PMA_SQPdata_forbidden_word = array ( * * @global integer MySQL forbidden words count */ -$PMA_SQPdata_forbidden_word_cnt = 483; +$PMA_SQPdata_forbidden_word_cnt = 482; /** * the MySQL column/data types