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

Merge branch 'QA_3_4'

Browse Source
This commit is contained in:
Marc Delisle 2011-06-04 06:39:24 -04:00
commit 8d07c5bd77
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -16,6 +16,7 @@
3.4.3.0 (not yet released)
- bug #3311170 [sync] Missing helper icons in Synchronize
- patch #3304473 [setup] Redefine a lable that was wrong
- bug #3304544 [parser] master is not a reserved word
3.4.2.0 (not yet released)
- bug #3301249 [interface] Iconic table operations does not remove inline edit label

3
libraries/sqlparser.data.php
View File

@ -527,7 +527,6 @@ $PMA_SQPdata_reserved_word = array (
'LOGS',
'LOW_PRIORITY',
'MARIA', // 5.1 ?
'MASTER',
'MASTER_CONNECT_RETRY',
'MASTER_HOST',
'MASTER_LOG_FILE',
@ -685,7 +684,7 @@ $PMA_SQPdata_reserved_word = array (
*
* @global integer MySQL reserved words count
*/
$PMA_SQPdata_reserved_word_cnt = 288;
$PMA_SQPdata_reserved_word_cnt = 287;
/**
* words forbidden to be used as column or table name wihtout quotes