nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2010-12-11 14:40:07 +01:00
parent 1ffe15d2b6 b36fb9e8bf
commit dc3c5de91e
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -124,8 +124,6 @@
- patch #3112792 [navi] Left panel table grouping incorrect, - patch #3112792 [navi] Left panel table grouping incorrect,
thanks to garas - garas thanks to garas - garas
- bug #3123433 [interface] Avoid double escaping of MySQL errors. - 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. - [interface] Use less noisy message and remove disable link on server charts and database statistics.
3.3.9.0 (not yet released) 3.3.9.0 (not yet released)
@@ -137,6 +135,7 @@
- patch #3117535 [replication] Add quotes to database in initial statement, - patch #3117535 [replication] Add quotes to database in initial statement,
thanks to Craig Duncan - duncan3dc thanks to Craig Duncan - duncan3dc
- bug #3112614 [pdf schema] Scratchboard for PDF pages not working - 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) 3.3.8.1 (2010-11-29)
- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8

6
libraries/sqlparser.data.php
View File

@@ -516,7 +516,6 @@ $PMA_SQPdata_reserved_word = array (
'LAST_INSERT_ID', 'LAST_INSERT_ID',
'LEADING', 'LEADING',
'LEFT', 'LEFT',
'LEVEL',
'LIKE', 'LIKE',
'LIMIT', 'LIMIT',
'LINEAR', // 5.1 'LINEAR', // 5.1
@@ -686,7 +685,7 @@ $PMA_SQPdata_reserved_word = array (
* *
* @global integer MySQL reserved words count * @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 * words forbidden to be used as column or table name wihtout quotes
@@ -905,7 +904,6 @@ $PMA_SQPdata_forbidden_word = array (
'LEAVE', 'LEAVE',
'LEAVES', 'LEAVES',
'LEFT', 'LEFT',
'LEVEL',
'LIKE', 'LIKE',
'LIMIT', 'LIMIT',
'LINEAR', // 5.1 'LINEAR', // 5.1
@@ -1184,7 +1182,7 @@ $PMA_SQPdata_forbidden_word = array (
* *
* @global integer MySQL forbidden words count * @global integer MySQL forbidden words count
*/ */
$PMA_SQPdata_forbidden_word_cnt = 483; $PMA_SQPdata_forbidden_word_cnt = 482;
/** /**
* the MySQL column/data types * the MySQL column/data types