Commit 10661041 authored by unknown's avatar unknown
Browse files

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

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
parents 67bd43b3 8db63fd5

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;

mysql-test/r/func_time.result

+19 −0
Original line number Diff line number Diff line
@@ -732,6 +732,25 @@ SELECT count(*) FROM t1 WHERE d>FROM_DAYS(TO_DAYS(@TMP)) AND d<=FROM_DAYS(TO_DAY 
count(*)

3

DROP TABLE t1;

select last_day('2005-00-00');

last_day('2005-00-00')

NULL

Warnings:

Warning	1292	Truncated incorrect datetime value: '2005-00-00'

select last_day('2005-00-01');

last_day('2005-00-01')

NULL

Warnings:

Warning	1292	Truncated incorrect datetime value: '2005-00-01'

select last_day('2005-01-00');

last_day('2005-01-00')

NULL

Warnings:

Warning	1292	Truncated incorrect datetime value: '2005-01-00'

select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')),

monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));

monthname(str_to_date(null, '%m'))	monthname(str_to_date(null, '%m'))	monthname(str_to_date(1, '%m'))	monthname(str_to_date(0, '%m'))

NULL	NULL	January	NULL

explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,

timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

mysql-test/r/mysql.result

+10 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ c_cp932 
+----------------------+------------+--------+

| >a   <               | b          | 123421 | 

| >a   <               | 0123456789 |      4 | 

| >abcd<               | NULL       |      4 | 

| >abcd<               |            |      4 | 

+----------------------+------------+--------+

+------+------+---------------------------+

| i    | j    | k                         |
@@ -94,6 +94,14 @@ c_cp932 
| Field | Type    | Null | Key | Default | Extra |

+-------+---------+------+-----+---------+-------+

| i     | int(11) | YES  |     | NULL    |       | 

| j     | int(11) | NO   |     | NULL    |       | 

| j     | int(11) | NO   |     |         |       | 

| k     | int(11) | YES  |     | NULL    |       | 

+-------+---------+------+-----+---------+-------+

+------+------+

| i    | s1   |

+------+------+

|    1 | x    | 

|    2 | NULL | 

|    3 |      | 

+------+------+

End of 5.0 tests

mysql-test/t/func_time.test

+14 −0
Original line number Diff line number Diff line
@@ -352,6 +352,20 @@ INSERT INTO t1 VALUES (NOW()); 
SELECT count(*) FROM t1 WHERE d>FROM_DAYS(TO_DAYS(@TMP)) AND d<=FROM_DAYS(TO_DAYS(@TMP)+1);

DROP TABLE t1;



#

# Bug #10568

#



select last_day('2005-00-00');

select last_day('2005-00-01');

select last_day('2005-01-00');



#

# Bug #18501: monthname and NULLs

#



select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')),

       monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));



# End of 4.1 tests

mysql-test/t/mysql.test

+8 −0
Original line number Diff line number Diff line
@@ -72,3 +72,11 @@ drop table t1; 
#

--exec $MYSQL -t --default-character-set utf8 test -e "create table t1 (i int, j int not null, k int); insert into t1 values (null, 1, null); select * from t1; describe t1; drop table t1;"



#

# Bug#19564: mysql displays NULL instead of space

#

--exec $MYSQL -t test -e "create table b19564 (i int, s1 char(1)); insert into b19564 values (1, 'x'); insert into b19564 values (2, NULL); insert into b19564 values (3, ' '); select * from b19564 order by i; drop table b19564;" 



--echo End of 5.0 tests