Skip to content
Browse files

Fix merge conflicts

  • Loading branch information...
1 parent 018974d commit 72eaf6d33895a1df7a9e60bb6ab35b6663247d06 @lem9 lem9 committed Dec 12, 2012
Showing with 10 additions and 3 deletions.
  1. +2 −0 ChangeLog
  2. +8 −3 tbl_tracking.php
View
2 ChangeLog
@@ -84,6 +84,8 @@ VerboseMultiSubmit, ReplaceHelpImg
- bug #3588354 [l10n] Portuguese Language not displaying correctly
- bug #3591412 [status] Live charts don't work for non-default server
- bug [core] Proxy ajax calls to pma.net to avoid browser notices
+- bug #3593534 [tracking] Structure Snapshot on tracked view renders invalid
+SQL
3.5.4.0 (2012-11-16)
- bug #3570212 [edit] uuid_short() is a no-arguments function
View
11 tbl_tracking.php
@@ -193,7 +193,11 @@ function PMA_filter_tracking(
$tracking_set = rtrim($tracking_set, ',');
$versionCreated = PMA_Tracker::createVersion(
- $GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version'], $tracking_set
+ $GLOBALS['db'],
+ $GLOBALS['table'],
+ $_REQUEST['version'],
+ $tracking_set,
+ PMA_Table::isView($GLOBALS['db'], $GLOBALS['table'])
);
if ($versionCreated) {
$msg = PMA_Message::success(
@@ -292,10 +296,11 @@ function PMA_filter_tracking(
$_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version']
);
- // Get first DROP TABLE and CREATE TABLE statements
+ // Get first DROP TABLE/VIEW and CREATE TABLE/VIEW statements
$drop_create_statements = $data['ddlog'][0]['statement'];
- if (strstr($data['ddlog'][0]['statement'], 'DROP TABLE')) {
+ if (strstr($data['ddlog'][0]['statement'], 'DROP TABLE')
+ || strstr($data['ddlog'][0]['statement'], 'DROP VIEW')) {
$drop_create_statements .= $data['ddlog'][1]['statement'];
}
// Print SQL code

0 comments on commit 72eaf6d

Please sign in to comment.
Something went wrong with that request. Please try again.