mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
@ -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 ?
|
||||
|
Reference in New Issue
Block a user