diff --git a/ChangeLog b/ChangeLog
index 9fc1b89dd..5070757b0 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-07-16 Michal Čihař  <michal@cihar.com>
+    * libraries/export/sql.php: Remove code for old MySQL version, do not
+      store query, better handle various end of lines (probably bug #979635).
+
 2004-07-15 Alexander M. Turek  <me@derrabus.de>
     * scripts/create_tables.old.sql, scripts/create_tables.sql: Force UTF-8
       for PMA database in MySQL 4.1 and above.
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index b77ab12d0..a0cc47de8 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -238,42 +238,26 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false)
     } else {
         PMA_DBI_query('SET SQL_QUOTE_SHOW_CREATE = 0');
     }
-    $result = PMA_DBI_query('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), NULL, PMA_DBI_QUERY_STORE);
-    if ($result != FALSE && PMA_DBI_num_rows($result) > 0) {
-        $tmpres        = PMA_DBI_fetch_row($result);
-        // Fix for case problems with winwin, thanks to
-        // Paweł Szczepański <pauluz at users.sourceforge.net>
-        $pos           = strpos($tmpres[1], ' (');
 
-        // Fix a problem with older versions of mysql
-        // Find the first opening parenthesys, i.e. that after the name
-        // of the table
-        $pos2          = strpos($tmpres[1], '(');
-        // Old mysql did not insert a space after table name
-        // in query "show create table ..."!
-        if ($pos2 != $pos + 1)
-        {
-            // This is the real position of the first character after
-            // the name of the table
-            $pos = $pos2;
-            // Old mysql did not even put newlines and indentation...
-            $tmpres[1] = str_replace(",", ",\n     ", $tmpres[1]);
-        }
-
-        $tmpres[1]     = substr($tmpres[1], 0, 13)
-                       . (($use_backquotes) ? PMA_backquote($tmpres[0]) : $tmpres[0])
-                       . substr($tmpres[1], $pos);
-        $tmpres[1]     = str_replace("\n", $crlf, $tmpres[1]);
+    $result = PMA_DBI_query('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), NULL, PMA_DBI_QUERY_UNBUFFERED);
+    if ($result != FALSE && ($row = PMA_DBI_fetch_row($result))) {
+        $create_query = $row[1];
+        unset($row);
 
+        // Should we use IF NOT EXISTS?
         if (isset($GLOBALS['if_not_exists'])) { 
-            $tmpres[1]     = preg_replace('/^CREATE TABLE/', 'CREATE TABLE IF NOT EXISTS', $tmpres[1]);
+            $create_query     = preg_replace('/^CREATE TABLE/', 'CREATE TABLE IF NOT EXISTS', $create_query);
         }
 
         // are there any constraints to cut out?
-        if (preg_match('@CONSTRAINT|FOREIGN[\s]+KEY@', $tmpres[1])) {
+        if (preg_match('@CONSTRAINT|FOREIGN[\s]+KEY@', $create_query)) {
             
             // split the query into lines, so we can easilly handle it
-            $sql_lines = preg_split('@\r?\n@', $tmpres[1]);
+            if (strpos(",\r\n ", $create_query) === FALSE) {
+                $sql_lines = preg_split('@\r|\n@', $create_query);
+            } else {
+                $sql_lines = preg_split('@\r\n@', $create_query);
+            }
             $sql_count = count($sql_lines);
 
             // lets find first line with constraints
@@ -289,15 +273,17 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false)
                 if (isset($GLOBALS['no_constraints_comments'])) {
                     $sql_constraints = '';
                 } else {
-                    $sql_constraints = $crlf . $GLOBALS['comment_marker'] . $crlf
-                                        . $GLOBALS['comment_marker'] . $GLOBALS['strConstraintsForDumped'] . $crlf
-                                        . $GLOBALS['comment_marker'] . $crlf;
+                    $sql_constraints = $crlf . $GLOBALS['comment_marker'] . 
+                                       $crlf . $GLOBALS['comment_marker'] . $GLOBALS['strConstraintsForDumped'] . 
+                                       $crlf . $GLOBALS['comment_marker'] . $crlf;
                 }
             }
 
             // comments for current table
             if (!isset($GLOBALS['no_constraints_comments'])) {
-                $sql_constraints .= $crlf .$GLOBALS['comment_marker'] . $crlf .$GLOBALS['comment_marker'] . $GLOBALS['strConstraintsForTable'] . ' ' . PMA_backquote($table) . $crlf . $GLOBALS['comment_marker'] . $crlf;
+                $sql_constraints .= $crlf . $GLOBALS['comment_marker'] . 
+                                    $crlf . $GLOBALS['comment_marker'] . $GLOBALS['strConstraintsForTable'] . ' ' . PMA_backquote($table) . 
+                                    $crlf . $GLOBALS['comment_marker'] . $crlf;
             }
 
             // let's do the work
@@ -320,10 +306,10 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false)
                 }
             }
             $sql_constraints .= ';' . $crlf;
-            $tmpres[1] = implode($crlf, array_slice($sql_lines, 0, $i)) . $crlf . implode($crlf, array_slice($sql_lines, $j, $sql_count - 1));
+            $create_query = implode($crlf, array_slice($sql_lines, 0, $i)) . $crlf . implode($crlf, array_slice($sql_lines, $j, $sql_count - 1));
             unset($sql_lines);
         }
-        $schema_create .= $tmpres[1];
+        $schema_create .= $create_query;
     }
 
     $schema_create .= $auto_increment;