From 1e81ce19e37d0613b08fb8397f228c65d7f20af7 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Tue, 2 Oct 2007 09:57:19 +0000
Subject: [PATCH] removed MySQL < 5 code

---
 import.php           |  3 +--
 main.php             | 45 ++------------------------------------------
 pdf_schema.php       |  4 +---
 pmd_relation_upd.php |  2 +-
 user_password.php    |  2 +-
 5 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/import.php b/import.php
index bf5725526..6559b17cf 100644
--- a/import.php
+++ b/import.php
@@ -327,8 +327,7 @@ if ($cfg['AllowAnywhereRecoding'] && $allow_recoding
     if ($charset_of_file != $charset) {
         $charset_conversion = TRUE;
     }
-} elseif (PMA_MYSQL_INT_VERSION >= 40100
-    && isset($charset_of_file) && $charset_of_file != 'utf8') {
+} elseif (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;
diff --git a/main.php b/main.php
index b2036bfb2..91284bfc7 100644
--- a/main.php
+++ b/main.php
@@ -127,12 +127,8 @@ if ($server > 0) {
         './server_variables.php?' . $common_url_query, 'show-variables');
     PMA_printListItem($strProcesses, 'li_mysql_processes',
         './server_processlist.php?' . $common_url_query, 'show-processlist');
-
-    if (PMA_MYSQL_INT_VERSION >= 40100) {
-        PMA_printListItem($strCharsetsAndCollations, 'li_mysql_collations',
-            './server_collations.php?' . $common_url_query);
-    }
-
+    PMA_printListItem($strCharsetsAndCollations, 'li_mysql_collations',
+        './server_collations.php?' . $common_url_query);
     PMA_printListItem($strStorageEngines, 'li_mysql_engines',
         './server_engines.php?' . $common_url_query);
 
@@ -221,35 +217,6 @@ if (empty($cfg['Lang'])) {
     echo '</li>';
 }
 
-
-if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding']
-  && $server != 0 && $allow_recoding && PMA_MYSQL_INT_VERSION < 40100) {
-    echo '<li id="li_select_charset">';
-    ?>
-    <form method="post" action="index.php" target="_parent">
-    <input type="hidden" name="server" value="<?php echo $server; ?>" />
-    <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
-    <?php echo $strMySQLCharset;?>:
-    <select name="convcharset"  xml:lang="en" dir="ltr"
-        onchange="this.form.submit();">
-    <?php
-    foreach ($cfg['AvailableCharsets'] AS $id => $tmpcharset) {
-        if ($convcharset == $tmpcharset) {
-            $selected = ' selected="selected"';
-        } else {
-            $selected = '';
-        }
-        echo '        '
-           . '<option value="' . $tmpcharset . '"' . $selected . '>' . $tmpcharset . '</option>' . "\n";
-    }
-    ?>
-    </select>
-    <noscript><input type="submit" value="<?php echo $strGo;?>" /></noscript>
-    </form>
-    </li>
-    <?php
-}
-
 // added by Michael Keck <mail_at_michaelkeck_dot_de>
 // ThemeManager if available
 
@@ -331,14 +298,6 @@ if (PMA_PHP_INT_VERSION < 50200) {
     echo '<div class="warning">' . sprintf($strUpgrade, 'PHP', '5.2.0') . '</div>' . "\n";
 }
 
-/**
- * Warning for old MySQL version
- */
-// not yet defined before the server choice
-if (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION < 50000) {
-    echo '<div class="warning">' . sprintf($strUpgrade, 'MySQL', '5.0') . '</div>' . "\n";
-}
-
 /**
  * Warning about different MySQL library and server version
  * (a difference on the third digit does not count)
diff --git a/pdf_schema.php b/pdf_schema.php
index 5d31802d6..3dbda727c 100644
--- a/pdf_schema.php
+++ b/pdf_schema.php
@@ -1125,9 +1125,7 @@ function PMA_RT_DOC($alltables)
         $pdf->ln();
 
         $cfgRelation = PMA_getRelationsParam();
-        if ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100) {
-            $comments = PMA_getComments($db, $table);
-        }
+        $comments = PMA_getComments($db, $table);
         if ($cfgRelation['mimework']) {
             $mime_map = PMA_getMIME($db, $table, true);
         }
diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php
index c7baf450a..f8a55172e 100644
--- a/pmd_relation_upd.php
+++ b/pmd_relation_upd.php
@@ -27,7 +27,7 @@ if ($type_T1 == 'INNODB' && $type_T2 == 'INNODB') {
     // InnoDB
     $existrel_innodb = PMA_getForeigners($DB2, $T2, '', 'innodb');
 
-    if (PMA_MYSQL_INT_VERSION >= 40013 && isset($existrel_innodb[$F2]['constraint'])) {
+    if (isset($existrel_innodb[$F2]['constraint'])) {
         $upd_query  = 'ALTER TABLE ' . PMA_backquote($T2)
                   . ' DROP FOREIGN KEY '
                   . PMA_backquote($existrel_innodb[$F2]['constraint']);
diff --git a/user_password.php b/user_password.php
index 4091ffb15..1b0bdf975 100644
--- a/user_password.php
+++ b/user_password.php
@@ -49,7 +49,7 @@ if (isset($nopass)) {
         $common_url_query = PMA_generate_common_url();
 
         $err_url          = 'user_password.php?' . $common_url_query;
-    $hashing_function = (PMA_MYSQL_INT_VERSION >= 40102 && !empty($pw_hash) && $pw_hash == 'old' ? 'OLD_' : '')
+        $hashing_function = (!empty($pw_hash) && $pw_hash == 'old' ? 'OLD_' : '')
                       . 'PASSWORD';
 
         $sql_query        = 'SET password = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . preg_replace('@.@s', '*', $pma_pw) . '\')');