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

Fix merge conflicts

Browse Source
This commit is contained in:
Marc Delisle
2010-12-11 08:19:42 -05:00
parent 1f5896a88b b6f717a602
commit b36fb9e8bf
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/sqlparser.data.php
View File

@@ -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