diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-24 19:16:45 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-24 19:16:45 +0200 |
| commit | c6c7bc4774e66651a632b8b80780ec2923db9112 (patch) | |
| tree | 7b8a1f42c2d164721cb3115df17003c2059acf49 /tests/mysql_client_test.c | |
| parent | cebf57627e767ed4f082af072764af2a6878098a (diff) | |
| parent | b12da99ea37dd6f257d4c571ba7213f14fd9b52b (diff) | |
| download | mariadb-git-c6c7bc4774e66651a632b8b80780ec2923db9112.tar.gz | |
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
Diffstat (limited to 'tests/mysql_client_test.c')
| -rw-r--r-- | tests/mysql_client_test.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 30bb2813815..eef3ddedb7b 100644 --- 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 ? |