From 18f9231d742caf2fa99f7f8400323873de773673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 17 Feb 2016 10:52:04 +0100
Subject: [PATCH] Fixed CSV import
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                | 1 +
 libraries/import.lib.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 677c55883a..0bc9b27f2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,7 @@ phpMyAdmin - ChangeLog
 - issue #11923 Errors on Structure tab when user only has select access on certain columns
 - issue #11972 Missing documentation for $cfg['Servers'][$i]['favorite'] and $cfg['NumFavoriteTables']
 - issue #11907 Avoid displaying UPDATE query twice
+- issue #11850 Fixed CSV import
 
 4.5.5.0 (not yet released)
 - issue        Undefined index: is_ajax_request
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 172a21d7af..684e1f2efc 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -213,7 +213,7 @@ function PMA_importRunQuery($sql = '', $full = '')
         } else {
             $executed_queries++;
 
-            if ($run_query && $executed_queries < 50) {
+            if ($run_query && $executed_queries < 50 && empty($sql)) {
                 $go_sql = true;
                 if (! $sql_query_disabled) {
                     $complete_query = $sql_query;