diff --git a/ChangeLog b/ChangeLog
index 1fa2aee57..9a5c28435 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-06-15 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/sql_query_form.lib.php: Delimiter only if MySQL supports it
+
 2006-06-13 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sql_query_form.lib.php, libraries/import/sql.php, lang/*:
       bug # 1469699, can't create a stored procedure
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 3fe2a3c31..a1707e5f4 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -354,10 +354,12 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false)
     }
     echo '</div>' . "\n";
     echo '<div class="formelement">' . "\n";
-    echo '<label for="id_sql_delimiter">[ ' . $GLOBALS['strDelimiter']
-        .'</label>' . "\n";
-    echo '<input type="text" name="sql_delimiter" size="3" value=";" '
-        .'id="id_sql_delimiter" /> ]' . "\n";
+    if (PMA_MYSQL_INT_VERSION >= 50000) {
+        echo '<label for="id_sql_delimiter">[ ' . $GLOBALS['strDelimiter']
+            .'</label>' . "\n";
+        echo '<input type="text" name="sql_delimiter" size="3" value=";" '
+            .'id="id_sql_delimiter" /> ]' . "\n";
+    }
 
     echo '<input type="checkbox" name="show_query" value="1" '
         .'id="checkbox_show_query" checked="checked" />' . "\n"