From 0fd92594b452e1a920849c2304159a3a1b3f79f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 21 Mar 2003 11:58:49 +0000
Subject: [PATCH] Use $sql_query instead of $query to put query correctly to
 sql.php3.

---
 ChangeLog      |  4 ++++
 ldi_check.php3 | 32 ++++++++++++++++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d29adb841..ff3142de8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-03-21 Michal Cihar  <nijel@users.sourceforge.net>
+    * ldi_check.php3: Use $sql_query instead of $query to put query correctly
+      to sql.php3.
+
 2003-03-20 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/hebrew update, thanks to Yuval Sarna
 
diff --git a/ldi_check.php3 b/ldi_check.php3
index 87b3b5186..6cf53d71a 100755
--- a/ldi_check.php3
+++ b/ldi_check.php3
@@ -54,7 +54,7 @@ if (isset($btnLDI) && ($textfile != 'none')) {
     chmod($textfile, 0777);
 
     // Builds the query
-    $query     =  'LOAD DATA';
+    $sql_query     =  'LOAD DATA';
 
     // for versions before 3.23.49, we use the LOCAL keyword, because
     // there was a version (cannot find which one, and it does not work
@@ -66,7 +66,7 @@ if (isset($btnLDI) && ($textfile != 'none')) {
     // for speed
 
     if (PMA_MYSQL_INT_VERSION < 32349) {
-        $query     .= ' LOCAL';
+        $sql_query     .= ' LOCAL';
     }
 
     if (PMA_MYSQL_INT_VERSION > 40003) {
@@ -75,45 +75,45 @@ if (isset($btnLDI) && ($textfile != 'none')) {
         if ($result != FALSE && mysql_num_rows($result) > 0) {
             $tmp = PMA_mysql_fetch_row($result);
             if ($tmp[1] == 'ON') {
-                $query     .= ' LOCAL';
+                $sql_query     .= ' LOCAL';
             }
         }
         mysql_free_result($result);
     }
 
-    $query     .= ' INFILE \'' . $textfile . '\'';
+    $sql_query     .= ' INFILE \'' . $textfile . '\'';
     if (!empty($replace)) {
-        $query .= ' ' . $replace;
+        $sql_query .= ' ' . $replace;
     }
-    $query     .= ' INTO TABLE ' . PMA_backquote($into_table);
+    $sql_query     .= ' INTO TABLE ' . PMA_backquote($into_table);
     if (isset($field_terminater)) {
-        $query .= ' FIELDS TERMINATED BY \'' . $field_terminater . '\'';
+        $sql_query .= ' FIELDS TERMINATED BY \'' . $field_terminater . '\'';
     }
     if (isset($enclose_option) && strlen($enclose_option) > 0) {
-        $query .= ' OPTIONALLY';
+        $sql_query .= ' OPTIONALLY';
     }
     if (strlen($enclosed) > 0) {
-        $query .= ' ENCLOSED BY \'' . $enclosed . '\'';
+        $sql_query .= ' ENCLOSED BY \'' . $enclosed . '\'';
     }
     if (strlen($escaped) > 0) {
-        $query .= ' ESCAPED BY \'' . $escaped . '\'';
+        $sql_query .= ' ESCAPED BY \'' . $escaped . '\'';
     }
     if (strlen($line_terminator) > 0){
-        $query .= ' LINES TERMINATED BY \'' . $line_terminator . '\'';
+        $sql_query .= ' LINES TERMINATED BY \'' . $line_terminator . '\'';
     }
     if (strlen($column_name) > 0) {
         if (PMA_MYSQL_INT_VERSION >= 32306) {
-            $query .= ' (';
+            $sql_query .= ' (';
             $tmp   = split(',( ?)', $column_name);
             for ($i = 0; $i < count($tmp); $i++) {
                 if ($i > 0) {
-                    $query .= ', ';
+                    $sql_query .= ', ';
                 }
-                $query     .= PMA_backquote(trim($tmp[$i]));
+                $sql_query     .= PMA_backquote(trim($tmp[$i]));
             } // end for
-            $query .= ')';
+            $sql_query .= ')';
         } else {
-            $query .= ' (' . $column_name . ')';
+            $sql_query .= ' (' . $column_name . ')';
         }
     }