diff --git a/htdocs/sql/import.php b/htdocs/sql/import.php
new file mode 100755
--- /dev/null
+++ b/htdocs/sql/import.php
@@ -0,0 +1,416 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Core script for import, this is just the glue around all other stuff
+ *
+ * @version $Id: import.php 10398 2007-05-15 11:16:10Z cybot_tm $
+ */
+
+/**
+ * Get the variables sent or posted to this script and a core script
+ */
+require_once './libraries/common.inc.php';
+$js_to_run = 'functions.js';
+
+// default values
+$GLOBALS['reload'] = false;
+
+// Are we just executing plain query or sql file? (eg. non import, but query box/window run)
+if (!empty($sql_query)) {
+    // run SQL query
+    $import_text = $sql_query;
+    $import_type = 'query';
+    $format = 'sql';
+
+    // refresh left frame on changes in table or db structure
+    if (preg_match('/^(CREATE|ALTER|DROP)\s+(VIEW|TABLE|DATABASE|SCHEMA)\s+/i', $sql_query)) {
+        $GLOBALS['reload'] = true;
+    }
+
+    $sql_query = '';
+} elseif (!empty($sql_localfile)) {
+    // run SQL file on server
+    $local_import_file = $sql_localfile;
+    $import_type = 'queryfile';
+    $format = 'sql';
+    unset($sql_localfile);
+} elseif (!empty($sql_file)) {
+    // run uploaded SQL file
+    $import_file = $sql_file;
+    $import_type = 'queryfile';
+    $format = 'sql';
+    unset($sql_file);
+} elseif (!empty($id_bookmark)) {
+    // run bookmark
+    $import_type = 'query';
+    $format = 'sql';
+}
+
+// If we didn't get any parameters, either user called this directly, or
+// upload limit has been reached, let's assume the second possibility.
+if ($_POST == array() && $_GET == array()) {
+    require_once './libraries/header.inc.php';
+    $show_error_header = TRUE;
+    PMA_showMessage(sprintf($strUploadLimit, '[a@./Documentation.html#faq1_16@_blank]', '[/a]'));
+    require './libraries/footer.inc.php';
+}
+
+// Check needed parameters
+PMA_checkParameters(array('import_type', 'format'));
+
+// We don't want anything special in format
+$format = PMA_securePath($format);
+
+// Import functions
+require_once './libraries/import.lib.php';
+
+// Create error and goto url
+if ($import_type == 'table') {
+    $err_url = 'tbl_import.php?' . PMA_generate_common_url($db, $table);
+    $goto = 'tbl_import.php';
+} elseif ($import_type == 'database') {
+    $err_url = 'db_import.php?' . PMA_generate_common_url($db);
+    $goto = 'db_import.php';
+} elseif ($import_type == 'server') {
+    $err_url = 'server_import.php?' . PMA_generate_common_url();
+    $goto = 'server_import.php';
+} else {
+    if (empty($goto) || !preg_match('@^(server|db|tbl)(_[a-z]*)*\.php$@i', $goto)) {
+        if (strlen($table) && strlen($db)) {
+            $goto = 'tbl_structure.php';
+        } elseif (strlen($db)) {
+            $goto = 'db_structure.php';
+        } else {
+            $goto = 'server_sql.php';
+        }
+    }
+    if (strlen($table) && strlen($db)) {
+        $common = PMA_generate_common_url($db, $table);
+    } elseif (strlen($db)) {
+        $common = PMA_generate_common_url($db);
+    } else {
+        $common = PMA_generate_common_url();
+    }
+    $err_url  = $goto
+              . '?' . $common
+              . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&amp;table=' . urlencode($table) : '');
+}
+
+
+if (strlen($db)) {
+    PMA_DBI_select_db($db);
+}
+
+@set_time_limit($cfg['ExecTimeLimit']);
+if (!empty($cfg['MemoryLimit'])) {
+    @ini_set('memory_limit', $cfg['MemoryLimit']);
+}
+
+$timestamp = time();
+if (isset($allow_interrupt)) {
+    $maximum_time = ini_get('max_execution_time');
+} else {
+    $maximum_time = 0;
+}
+
+// set default values
+$timeout_passed = FALSE;
+$error = FALSE;
+$read_multiply = 1;
+$finished = FALSE;
+$offset = 0;
+$max_sql_len = 0;
+$file_to_unlink = '';
+$sql_query = '';
+$sql_query_disabled = FALSE;
+$go_sql = FALSE;
+$executed_queries = 0;
+$run_query = TRUE;
+$charset_conversion = FALSE;
+$reset_charset = FALSE;
+$bookmark_created = FALSE;
+
+// Bookmark Support: get a query back from bookmark if required
+if (!empty($id_bookmark)) {
+    require_once './libraries/bookmark.lib.php';
+    switch ($action_bookmark) {
+        case 0: // bookmarked query that have to be run
+            $import_text = PMA_queryBookmarks($db, $cfg['Bookmark'], $id_bookmark, 'id', isset($action_bookmark_all));
+            if (isset($bookmark_variable) && !empty($bookmark_variable)) {
+                $import_text = preg_replace('|/\*(.*)\[VARIABLE\](.*)\*/|imsU', '${1}' . PMA_sqlAddslashes($bookmark_variable) . '${2}', $import_text);
+            }
+
+            // refresh left frame on changes in table or db structure
+            if (preg_match('/^(CREATE|ALTER|DROP)\s+(VIEW|TABLE|DATABASE|SCHEMA)\s+/i', $import_text)) {
+                $GLOBALS['reload'] = true;
+            }
+
+            break;
+        case 1: // bookmarked query that have to be displayed
+            $import_text = PMA_queryBookmarks($db, $cfg['Bookmark'], $id_bookmark);
+            $run_query = FALSE;
+            break;
+        case 2: // bookmarked query that have to be deleted
+            $import_text = PMA_queryBookmarks($db, $cfg['Bookmark'], $id_bookmark);
+            PMA_deleteBookmarks($db, $cfg['Bookmark'], $id_bookmark);
+            $run_query = FALSE;
+            $error = TRUE; // this is kind of hack to skip processing the query
+            break;
+    }
+} // end bookmarks reading
+
+// Do no run query if we show PHP code
+if (isset($GLOBALS['show_as_php'])) {
+    $run_query = FALSE;
+    $go_sql = TRUE;
+}
+
+// Store the query as a bookmark before executing it if bookmarklabel was given
+if (!empty($bkm_label) && !empty($import_text)) {
+    require_once './libraries/bookmark.lib.php';
+    $bfields = array(
+                 'dbase' => $db,
+                 'user'  => $cfg['Bookmark']['user'],
+                 'query' => urlencode($import_text),
+                 'label' => $bkm_label
+    );
+
+    // Should we replace bookmark?
+    if (isset($bkm_replace)) {
+        $bookmarks = PMA_listBookmarks($db, $cfg['Bookmark']);
+        foreach ($bookmarks as $key => $val) {
+            if ($val == $bkm_label) {
+                PMA_deleteBookmarks($db, $cfg['Bookmark'], $key);
+            }
+        }
+    }
+
+    PMA_addBookmarks($bfields, $cfg['Bookmark'], isset($bkm_all_users));
+
+    $bookmark_created = TRUE;
+} // end store bookmarks
+
+// We can not read all at once, otherwise we can run out of memory
+$memory_limit = trim(@ini_get('memory_limit'));
+// 2 MB as default
+if (empty($memory_limit)) {
+    $memory_limit = 2 * 1024 * 1024;
+}
+// In case no memory limit we work on 10MB chunks
+if ($memory_limit = -1) {
+    $memory_limit = 10 * 1024 * 1024;
+}
+
+// Calculate value of the limit
+if (strtolower(substr($memory_limit, -1)) == 'm') {
+    $memory_limit = (int)substr($memory_limit, 0, -1) * 1024 * 1024;
+} elseif (strtolower(substr($memory_limit, -1)) == 'k') {
+    $memory_limit = (int)substr($memory_limit, 0, -1) * 1024;
+} elseif (strtolower(substr($memory_limit, -1)) == 'g') {
+    $memory_limit = (int)substr($memory_limit, 0, -1) * 1024 * 1024 * 1024;
+} else {
+    $memory_limit = (int)$memory_limit;
+}
+
+$read_limit = $memory_limit / 8; // Just to be sure, there might be lot of memory needed for uncompression
+
+// handle filenames
+if (!empty($local_import_file) && !empty($cfg['UploadDir'])) {
+
+    // sanitize $local_import_file as it comes from a POST
+    $local_import_file = PMA_securePath($local_import_file);
+
+    $import_file  = PMA_userDir($cfg['UploadDir']) . $local_import_file;
+} elseif (empty($import_file) || !is_uploaded_file($import_file))  {
+    $import_file  = 'none';
+}
+
+// Do we have file to import?
+if ($import_file != 'none' && !$error) {
+    // work around open_basedir and other limitations
+    $open_basedir = @ini_get('open_basedir');
+
+    // If we are on a server with open_basedir, we must move the file
+    // before opening it. The doc explains how to create the "./tmp"
+    // directory
+
+    if (!empty($open_basedir)) {
+
+        $tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : './tmp/');
+
+        // function is_writeable() is valid on PHP3 and 4
+        if (is_writeable($tmp_subdir)) {
+            $import_file_new = $tmp_subdir . basename($import_file);
+            if (move_uploaded_file($import_file, $import_file_new)) {
+                $import_file = $import_file_new;
+                $file_to_unlink = $import_file_new;
+            }
+        }
+    }
+
+    // Handle file compression
+    $compression = PMA_detectCompression($import_file);
+    if ($compression === FALSE) {
+        $message = $strFileCouldNotBeRead;
+        $show_error_header = TRUE;
+        $error = TRUE;
+    } else {
+        switch ($compression) {
+            case 'application/bzip2':
+                if ($cfg['BZipDump'] && @function_exists('bzopen')) {
+                    $import_handle = @bzopen($import_file, 'r');
+                } else {
+                    $message = sprintf($strUnsupportedCompressionDetected, $compression);
+                    $show_error_header = TRUE;
+                    $error = TRUE;
+                }
+                break;
+            case 'application/gzip':
+                if ($cfg['GZipDump'] && @function_exists('gzopen')) {
+                    $import_handle = @gzopen($import_file, 'r');
+                } else {
+                    $message = sprintf($strUnsupportedCompressionDetected, $compression);
+                    $show_error_header = TRUE;
+                    $error = TRUE;
+                }
+                break;
+            case 'application/zip':
+                if ($cfg['GZipDump'] && @function_exists('gzinflate')) {
+                    include_once './libraries/unzip.lib.php';
+                    $import_handle = new SimpleUnzip();
+                    $import_handle->ReadFile($import_file);
+                    if ($import_handle->Count() == 0) {
+                        $message = $strNoFilesFoundInZip;
+                        $show_error_header = TRUE;
+                        $error = TRUE;
+                    } elseif ($import_handle->GetError(0) != 0) {
+                        $message = $strErrorInZipFile . ' ' . $import_handle->GetErrorMsg(0);
+                        $show_error_header = TRUE;
+                        $error = TRUE;
+                    } else {
+                        $import_text = $import_handle->GetData(0);
+                    }
+                    // We don't need to store it further
+                    $import_handle = '';
+                } else {
+                    $message = sprintf($strUnsupportedCompressionDetected, $compression);
+                    $show_error_header = TRUE;
+                    $error = TRUE;
+                }
+                break;
+            case 'none':
+                $import_handle = @fopen($import_file, 'r');
+                break;
+            default:
+                $message = sprintf($strUnsupportedCompressionDetected, $compression);
+                $show_error_header = TRUE;
+                $error = TRUE;
+                break;
+        }
+    }
+    if (!$error && $import_handle === FALSE) {
+        $message = $strFileCouldNotBeRead;
+        $show_error_header = TRUE;
+        $error = TRUE;
+    }
+} elseif (!$error) {
+    if (!isset($import_text) || empty($import_text)) {
+        $message = $strNoDataReceived;
+        $show_error_header = TRUE;
+        $error = TRUE;
+    }
+}
+
+// Convert the file's charset if necessary
+if ($cfg['AllowAnywhereRecoding'] && $allow_recoding
+    && isset($charset_of_file)) {
+    if ($charset_of_file != $charset) {
+        $charset_conversion = TRUE;
+    }
+} elseif (PMA_MYSQL_INT_VERSION >= 40100
+    && isset($charset_of_file) && $charset_of_file != 'utf8') {
+    PMA_DBI_query('SET NAMES \'' . $charset_of_file . '\'');
+    // We can not show query in this case, it is in different charset
+    $sql_query_disabled = TRUE;
+    $reset_charset = TRUE;
+}
+
+// Something to skip?
+if (!$error && isset($skip)) {
+    $original_skip = $skip;
+    while ($skip > 0) {
+        PMA_importGetNextChunk($skip < $read_limit ? $skip : $read_limit);
+        $read_multiply = 1; // Disable read progresivity, otherwise we eat all memory!
+        $skip -= $read_limit;
+    }
+    unset($skip);
+}
+
+if (!$error) {
+    // Check for file existance
+    if (!file_exists('./libraries/import/' . $format . '.php')) {
+        $error = TRUE;
+        $message = $strCanNotLoadImportPlugins;
+        $show_error_header = TRUE;
+    } else {
+        // Do the real import
+        $plugin_param = $import_type;
+        require './libraries/import/' . $format . '.php';
+    }
+}
+
+// Cleanup temporary file
+if ($file_to_unlink != '') {
+    unlink($file_to_unlink);
+}
+
+// Reset charset back, if we did some changes
+if ($reset_charset) {
+    PMA_DBI_query('SET CHARACTER SET utf8');
+    PMA_DBI_query('SET SESSION collation_connection =\'' . $collation_connection . '\'');
+}
+
+// Show correct message
+if (!empty($id_bookmark) && $action_bookmark == 2) {
+    $message = $strBookmarkDeleted;
+    $display_query = $import_text;
+    $error = FALSE; // unset error marker, it was used just to skip processing
+} elseif (!empty($id_bookmark) && $action_bookmark == 1) {
+    $message = $strShowingBookmark;
+} elseif ($bookmark_created) {
+    $special_message = '[br]' . sprintf($strBookmarkCreated, htmlspecialchars($bkm_label));
+} elseif ($finished && !$error) {
+    if ($import_type == 'query') {
+        $message = $strSuccess;
+    } else {
+        $message = sprintf($strImportSuccessfullyFinished, $executed_queries);
+    }
+}
+
+// Did we hit timeout? Tell it user.
+if ($timeout_passed) {
+    $message = $strTimeoutPassed;
+    if ($offset == 0 || (isset($original_skip) && $original_skip == $offset)) {
+        $message .= ' ' . $strTimeoutNothingParsed;
+    }
+}
+
+// Parse and analyze the query, for correct db and table name
+// in case of a query typed in the query window
+require_once './libraries/parse_analyze.lib.php';
+
+// There was an error?
+if (isset($my_die)) {
+    foreach ($my_die AS $key => $die) {
+        PMA_mysqlDie($die['error'], $die['sql'], '', $err_url, $error);
+    }
+}
+
+if ($go_sql) {
+    require './sql.php';
+} else {
+    $active_page = $goto;
+    require './' . $goto;
+}
+exit();
+?>