diff options
| author | unknown <evgen@moonbone.local> | 2005-11-01 19:47:53 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-11-01 19:47:53 +0300 |
| commit | 70536ba1b5b4c8e81f71b714112b42ff3fcc3f5e (patch) | |
| tree | 6c1605103b3513ebad088e2997385997cd4d354f /client | |
| parent | ee380a077782f87d80aae7a8c9c9ead51dfd8e7b (diff) | |
| parent | 03ed0d1d244de2e97c1ca5749f1677d1dbb07f95 (diff) | |
| download | mariadb-git-70536ba1b5b4c8e81f71b714112b42ff3fcc3f5e.tar.gz | |
Manually merged
client/mysqltest.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/r/update.result:
Auto merged
mysql-test/t/update.test:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/spatial.cc:
Auto merged
sql/sql_select.h:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 6543dba0bb8..58c0928c36d 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -3616,19 +3616,24 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) /* Read result from each column */ for (col_idx= 0; col_idx < num_fields; col_idx++) { - /* FIXME is string terminated? */ - const char *val= (const char *)bind[col_idx].buffer; - ulonglong len= *bind[col_idx].length; + const char *val; + ulonglong len; if (col_idx < max_replace_column && replace_column[col_idx]) { val= replace_column[col_idx]; len= strlen(val); } - if (*bind[col_idx].is_null) + else if (*bind[col_idx].is_null) { val= "NULL"; len= 4; } + else + { + /* FIXME is string terminated? */ + val= (const char *) bind[col_idx].buffer; + len= *bind[col_idx].length; + } if (!display_result_vertically) { if (col_idx) /* No tab before first col */ |