diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-09-14 09:21:09 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-09-14 09:21:09 -0400 |
| commit | ebf4d199df237beca077442a5848148a86de62bd (patch) | |
| tree | 1413553a55860d380b053d6126573d5136519e20 /client | |
| parent | e9ff111d1ecd46202fd8c817a472db20a9e788be (diff) | |
| parent | 94382c313a7dd704f13ab4f3ade34e40c48c1eb8 (diff) | |
| download | mariadb-git-ebf4d199df237beca077442a5848148a86de62bd.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 2ba9e896747..5e09c309917 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2321,10 +2321,8 @@ print_table_data(MYSQL_RES *result) MYSQL_ROW cur; MYSQL_FIELD *field; bool *num_flag; - bool *not_null_flag; num_flag=(bool*) my_alloca(sizeof(bool)*mysql_num_fields(result)); - not_null_flag=(bool*) my_alloca(sizeof(bool)*mysql_num_fields(result)); if (info_flag) { print_field_types(result); @@ -2363,7 +2361,6 @@ print_table_data(MYSQL_RES *result) MAX_COLUMN_LENGTH), field->name); num_flag[off]= IS_NUM(field->type); - not_null_flag[off]= IS_NOT_NULL(field->flags); } (void) tee_fputs("\n", PAGER); tee_puts((char*) separator.ptr(), PAGER); @@ -2384,7 +2381,7 @@ print_table_data(MYSQL_RES *result) uint extra_padding; /* If this column may have a null value, use "NULL" for empty. */ - if (! not_null_flag[off] && (cur[off] == NULL)) + if (cur[off] == NULL) { buffer= "NULL"; data_length= 4; @@ -2424,7 +2421,6 @@ print_table_data(MYSQL_RES *result) } tee_puts((char*) separator.ptr(), PAGER); my_afree((gptr) num_flag); - my_afree((gptr) not_null_flag); } |