The branch, master has been updated
via b36fb9e8bf210a442853e4009297aa0ea1980ecb (commit)
via b6f717a6025c3785430c4cf317cfa5786564729b (commit)
from 1f5896a88b573d511f09e4e7958fcc08b3c33aea (commit)
- Log -----------------------------------------------------------------
commit b36fb9e8bf210a442853e4009297aa0ea1980ecb
Merge: 1f5896a88b573d511f09e4e7958fcc08b3c33aea
b6f717a6025c3785430c4cf317cfa5786564729b
Author: Marc Delisle <[email protected]>
Date: Sat Dec 11 08:19:42 2010 -0500
Fix merge conflicts
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/sqlparser.data.php | 6 ++----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8b795e3..a804ef8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -135,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 dffd6b1..e8a3115 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
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Oracle to DB2 Conversion Guide: Learn learn about native support for PL/SQL,
new data types, scalar functions, improved concurrency, built-in packages,
OCI, SQL*Plus, data movement tools, best practices and more.
http://p.sf.net/sfu/oracle-sfdev2dev
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
