diff options
| author | unknown <konstantin@mysql.com> | 2005-07-19 00:55:37 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-19 00:55:37 +0400 |
| commit | 5c7b9db04c25290e378d4f58481cc24603badb79 (patch) | |
| tree | 751108ce077ef66187d4c557a01975a26665d188 /client | |
| parent | 1ffb2d6d966ac019c3b8f3a11334c553bdcbd687 (diff) | |
| parent | 85de918cada8419b0019bc6595f19f42bc30380d (diff) | |
| download | mariadb-git-5c7b9db04c25290e378d4f58481cc24603badb79.tar.gz | |
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into mysql.com:/home/kostja/mysql/mysql-5.0-merge
client/mysqltest.c:
Auto merged
mysql-test/r/rpl_log.result:
Auto merged
mysql-test/r/rpl_rotate_logs.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/timezone_grant.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/timezone_grant.test:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
configure.in:
Manual merge
mysql-test/r/olap.result:
Manual merge
mysql-test/t/olap.test:
Manual merge
mysql-test/t/select.test:
Manual merge
sql/mysqld.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 67fa931a3f3..4b8bb047e47 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -3393,10 +3393,10 @@ static void run_query_display_metadata(MYSQL_FIELD *field, uint num_fields, int10_to_str((int) field->type, buff, 10); dynstr_append(ds, buff); dynstr_append_mem(ds, "\t", 1); - int10_to_str((int) field->length, buff, 10); + longlong10_to_str((unsigned int) field->length, buff, 10); dynstr_append(ds, buff); dynstr_append_mem(ds, "\t", 1); - int10_to_str((int) field->max_length, buff, 10); + longlong10_to_str((unsigned int) field->max_length, buff, 10); dynstr_append(ds, buff); dynstr_append_mem(ds, "\t", 1); dynstr_append_mem(ds, (char*) (IS_NOT_NULL(field->flags) ? |