From 4a4b22c59fc6652e5a965706c8c8e97399e531c4 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 13 Sep 2013 12:50:25 -0400 Subject: [PATCH 1/2] bug #4091 Insert ignore option does not work --- ChangeLog | 1 + libraries/insert_edit.lib.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc22dd53aa..e729ed204a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #3929 Database-specific privileges are not copied when cloning user - bug #3997 Error handling in case MySQL extension is missing - bug #4089 Moving Columns will alter column definition +- bug #4091 Insert ignore option does not work 4.0.6.0 (2013-09-05) - bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 3e57bce0de..47aab2a11b 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -1737,7 +1737,6 @@ function PMA_getParamsForUpdateOrInsert() $is_insert = $_REQUEST['submit_type'] == 'insert' || $_REQUEST['submit_type'] == 'showinsert' || $_REQUEST['submit_type'] == 'insertignore'; - $is_insertignore = $_REQUEST['submit_type'] == 'insertignore'; } else { // new row => use indexes $loop_array = array(); @@ -1746,8 +1745,8 @@ function PMA_getParamsForUpdateOrInsert() } $using_key = false; $is_insert = true; - $is_insertignore = false; } + $is_insertignore = $_REQUEST['submit_type'] == 'insertignore'; return array($loop_array, $using_key, $is_insert, $is_insertignore); } From 2d611cfa876407c23ccce516662dc0322f26fcc4 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 14 Sep 2013 06:24:32 -0400 Subject: [PATCH 2/2] bug #4090 Downloading BLOB downloads page template --- ChangeLog | 1 + tbl_get_field.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index e729ed204a..a9226fe6a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #3997 Error handling in case MySQL extension is missing - bug #4089 Moving Columns will alter column definition - bug #4091 Insert ignore option does not work +- bug #4090 Downloading BLOB downloads page template 4.0.6.0 (2013-09-05) - bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) diff --git a/tbl_get_field.php b/tbl_get_field.php index ada209f46e..cc41376fa6 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -9,6 +9,8 @@ /** * Common functions. */ +// we don't want the usual PMA_Response-generated HTML above the column's data +define('PMA_BYPASS_GET_INSTANCE', 1); require_once 'libraries/common.inc.php'; require_once 'libraries/mime.lib.php';