summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.(none)>2006-05-15 15:00:20 -0400
committerunknown <cmiller@zippy.(none)>2006-05-15 15:00:20 -0400
commitaba2ccbcc88a8e82c475a711cfda011a323cb775 (patch)
tree1bb8a966e65e324ecfe4235ac3c93669f64c1013
parentcd866d01a61ac0f881e81605004c94677f3c17bf (diff)
parentb75d8b66a1aad873b3bf4a5e23ce245918a17f70 (diff)
downloadmariadb-git-aba2ccbcc88a8e82c475a711cfda011a323cb775.tar.gz
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-release
-rw-r--r--client/mysql.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 1557d5cae2a..80fee6f0995 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2338,8 +2338,7 @@ print_table_data(MYSQL_RES *result)
uint visible_length;
uint extra_padding;
- /* If this column may have a null value, use "NULL" for empty. */
- if (! not_null_flag[off] && (lengths[off] == 0))
+ if (! not_null_flag[off] && (cur[off] == NULL))
{
buffer= "NULL";
data_length= 4;