diff options
| author | unknown <reggie@linux.site> | 2005-07-18 08:03:59 -0600 |
|---|---|---|
| committer | unknown <reggie@linux.site> | 2005-07-18 08:03:59 -0600 |
| commit | 57c0c86f506be56ba4d9dce97f1f7f236c0b876f (patch) | |
| tree | 00701e2e0d6fb0b217e2c33c843ffaf59b215609 /tests | |
| parent | 85de918cada8419b0019bc6595f19f42bc30380d (diff) | |
| parent | 303e5a08d9858b1206f8ea251442158e9bb7193d (diff) | |
| download | mariadb-git-57c0c86f506be56ba4d9dce97f1f7f236c0b876f.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into linux.site:/home/reggie/bk/bug7142
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
sql/item.cc:
Auto merged
sql/sql_show.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index d3adbd8d601..1470c762602 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -7181,7 +7181,7 @@ static void test_explain_bug() verify_prepare_field(result, 3, "type", "", MYSQL_TYPE_VAR_STRING, "", "", "", 10, 0); - verify_prepare_field(result, 4, "possible_keys", "", MYSQL_TYPE_VAR_STRING, + verify_prepare_field(result, 4, "possible_keys", "", MYSQL_TYPE_BLOB, "", "", "", NAME_LEN*64, 0); verify_prepare_field(result, 5, "key", "", MYSQL_TYPE_VAR_STRING, @@ -7194,13 +7194,13 @@ static void test_explain_bug() (mysql_get_server_version(mysql) <= 50000 ? 3 : 4096), 0); - verify_prepare_field(result, 7, "ref", "", MYSQL_TYPE_VAR_STRING, + verify_prepare_field(result, 7, "ref", "", MYSQL_TYPE_BLOB, "", "", "", NAME_LEN*16, 0); verify_prepare_field(result, 8, "rows", "", MYSQL_TYPE_LONGLONG, "", "", "", 10, 0); - verify_prepare_field(result, 9, "Extra", "", MYSQL_TYPE_VAR_STRING, + verify_prepare_field(result, 9, "Extra", "", MYSQL_TYPE_BLOB, "", "", "", 255, 0); mysql_free_result(result); |