database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge

Browse Source 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


client/mysql.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
This commit is contained in:
unknown
2006-05-15 19:26:49 -04:00
parent 67bd43b34a 8db63fd52f
commit 10661041f4
6 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql.cc
View File

@@ -2339,7 +2339,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] && (lengths[off] == 0))
if (! not_null_flag[off] && (cur[off] == NULL))
{
buffer= "NULL";
data_length= 4;