Commit 553a4c8a authored by unknown's avatar unknown
Browse files

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
parents 2b9ed519 7941fdd0

tests/mysql_client_test.c

+16 −4
Original line number Diff line number Diff line
@@ -7497,10 +7497,22 @@ static void test_explain_bug() 
                       MYSQL_TYPE_STRING : MYSQL_TYPE_VAR_STRING,

                       0, 0, "", 3, 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, "", 64, 0);

                         0, 0, "",

                         mysql_get_server_version(mysql) >= 50027 ? 0 :64, 0);

  }



  verify_prepare_field(result, 5, "Extra", "EXTRA",

                       mysql_get_server_version(mysql) <= 50000 ?