From: Date: October 24 2006 7:16pm
Subject: bk commit into 5.0 tree (msvensson:1.2334) BUG#23037
List-Archive: http://lists.mysql.com/commits/14287
X-Bug: 23037
Message-Id: <20061024171624.1318986DE8C@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-24 19:16:18+02:00, msvensson@neptunus.(none) +1 -0
  Bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table"
   - Fix check in mysql_client_test to reflect the change of datatype
     for DEFAULT column

  tests/mysql_client_test.c@stripped, 2006-10-24 19:16:16+02:00, msvensson@neptunus.(none) +16 -4
    Update check of datatype for field DEFAULT returned from "explain"
    as datatype has changed after patch for bug 23037

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.211/tests/mysql_client_test.c	2006-10-24 19:16:23 +02:00
+++ 1.212/tests/mysql_client_test.c	2006-10-24 19:16:23 +02:00
@@ -7497,10 +7497,22 @@
                        MYSQL_TYPE_STRING : MYSQL_TYPE_VAR_STRING,
                        0, 0, "", 3, 0);
 
-  verify_prepare_field(result, 4, "Default", "COLUMN_DEFAULT",
-                       mysql_get_server_version(mysql) <= 50000 ?
-                       MYSQL_TYPE_STRING : MYSQL_TYPE_VAR_STRING,
-                       0, 0, "", 64, 0);
+  if ( mysql_get_server_version(mysql) >= 50027 )
+  {
+    /*  The patch for bug#23037 changes column type of DEAULT to blob */
+    verify_prepare_field(result, 4, "Default", "COLUMN_DEFAULT",
+                         MYSQL_TYPE_BLOB, 0, 0, "", 0, 0);
+  }
+  else
+  {
+    verify_prepare_field(result, 4, "Default", "COLUMN_DEFAULT",
+                         mysql_get_server_version(mysql) >= 50027 ?
+                         MYSQL_TYPE_BLOB :
+                         mysql_get_server_version(mysql) <= 50000 ?
+                         MYSQL_TYPE_STRING : MYSQL_TYPE_VAR_STRING,
+                         0, 0, "",
+                         mysql_get_server_version(mysql) >= 50027 ? 0 :64, 0);
+  }
 
   verify_prepare_field(result, 5, "Extra", "EXTRA",
                        mysql_get_server_version(mysql) <= 50000 ?