From 0ced617aff85bed21bddef6fd5fde03d60fcf1de Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Wed, 12 Dec 2007 08:53:34 +0000
Subject: [PATCH] MySQL bug #20910 fixed in 5.0.25
 (http://dev.mysql.com/doc/refman/5.0/en/news-5-0-25.html)

---
 tbl_alter.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tbl_alter.php b/tbl_alter.php
index 009898340..ebb0290a3 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -184,14 +184,16 @@ if ($abort == FALSE) {
      * or maybe make it part of PMA_DBI_get_fields();
      */
 
-    // We also need this to correctly learn if a TIMESTAMP is NOT NULL, since
-    // SHOW FULL FIELDS says NULL and SHOW CREATE TABLE says NOT NULL (tested
-    // in MySQL 4.0.25).
+    if (PMA_MYSQL_INT_VERSION < 50025) {
+        // We also need this to correctly learn if a TIMESTAMP is NOT NULL, since
+        // SHOW FULL FIELDS says NULL and SHOW CREATE TABLE says NOT NULL (tested
+        // in MySQL 4.0.25).
 
-    $show_create_table = PMA_DBI_fetch_value(
-        'SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table),
-        0, 1);
-    $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table));
+        $show_create_table = PMA_DBI_fetch_value(
+            'SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table),
+            0, 1);
+        $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table));
+    }
 
     require './libraries/tbl_properties.inc.php';
 }