Merge mysqldev@production.mysql.com:my/mysql-5.1-release

into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-release

Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-release
a261f81b · cmiller@zippy.(none) · 95ebebbe · eca1b560 · a261f81b
Commit a261f81b authored May 15, 2006 by cmiller@zippy.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

client/mysql.cc client/mysql.cc +1 -2

No files found.
--- 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] && (cur[off] == NULL))
-      if (! not_null_flag[off] && (lengths[off] == 0))
      {
        buffer= "NULL";
        data_length= 4;