Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint tests/mysql_client_test.c: Auto merged

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint tests/mysql_client_test.c: Auto merged
553a4c8a · unknown · 2b9ed519 · 7941fdd0 · 553a4c8a
Commit 553a4c8a authored Oct 24, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 4 deletions

tests/mysql_client_test.c tests/mysql_client_test.c +16 -4

No files found.
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -7497,10 +7497,22 @@ static void test_explain_bug()
                       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 ?