database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Check for NULLs only if we don't replace column results,

Browse Source 
get real results after all checks.
(see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).
This commit is contained in:
ramil@mysql.com
2005-10-31 16:28:45 +04:00
parent 5150bd8f9f
commit afbd0fafd3
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/mysqltest.c
View File

@ -3272,19 +3272,24 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
/* Read result from each column */ /* Read result from each column */
for (col_idx= 0; col_idx < num_fields; col_idx++) for (col_idx= 0; col_idx < num_fields; col_idx++)
{ {
/* FIXME is string terminated? */ const char *val;
const char *val= (const char *)bind[col_idx].buffer; ulonglong len;
ulonglong len= *bind[col_idx].length;
if (col_idx < max_replace_column && replace_column[col_idx]) if (col_idx < max_replace_column && replace_column[col_idx])
{ {
val= replace_column[col_idx]; val= replace_column[col_idx];
len= strlen(val); len= strlen(val);
} }
if (*bind[col_idx].is_null) else if (*bind[col_idx].is_null)
{ {
val= "NULL"; val= "NULL";
len= 4; len= 4;
} }
else
{
/* FIXME is string terminated? */
val= (const char *) bind[col_idx].buffer;
len= *bind[col_idx].length;
}
if (!display_result_vertically) if (!display_result_vertically)
{ {
if (col_idx) /* No tab before first col */ if (col_idx) /* No tab before first col */