Merge bk-internal:/home/bk/mysql-5.1-new-maint (5c9d6a68) · Commits · Software / OSDI20 Artifacts / mariadb

client/readline.cc

+2 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,8 @@ char batch_readline(LINE_BUFFER line_buff)
		if (!(pos=intern_read_line(line_buff,&out_length)))
		return 0;
		if (out_length && pos[out_length-1] == '\n')
		out_length--; /* Remove '\n' */
		if (--out_length && pos[out_length-1] == '\r') /* Remove '\n' */
		out_length--; /* Remove '\r' */
		line_buff->read_length=out_length;
		pos[out_length]=0;
		return pos;

mysql-test/r/date_formats.result

+48 −18

Original line number	Diff line number	Diff line
		@@ -189,12 +189,12 @@ date format datetime
		2003-01-02 02:11:12.12345AM %Y-%m-%d %h:%i:%S.%f %p 2003-01-02 02:11:12.123450
		2003-01-02 12:11:12.12345 am %Y-%m-%d %h:%i:%S.%f%p 2003-01-02 00:11:12.123450
		2003-01-02 11:11:12Pm %Y-%m-%d %h:%i:%S%p 2003-01-02 23:11:12
		10:20:10 %H:%i:%s 0000-00-00 10:20:10
		10:20:10 %h:%i:%s.%f 0000-00-00 10:20:10
		10:20:10 %T 0000-00-00 10:20:10
		10:20:10AM %h:%i:%s%p 0000-00-00 10:20:10
		10:20:10AM %r 0000-00-00 10:20:10
		10:20:10.44AM %h:%i:%s.%f%p 0000-00-00 10:20:10.440000
		10:20:10 %H:%i:%s 0000-00-00 00:00:00
		10:20:10 %h:%i:%s.%f 0000-00-00 00:00:00
		10:20:10 %T 0000-00-00 00:00:00
		10:20:10AM %h:%i:%s%p 0000-00-00 00:00:00
		10:20:10AM %r 0000-00-00 00:00:00
		10:20:10.44AM %h:%i:%s.%f%p 0000-00-00 00:00:00
		15-01-2001 12:59:58 %d-%m-%Y %H:%i:%S 2001-01-15 12:59:58
		15 September 2001 %d %M %Y 2001-09-15 00:00:00
		15 SEPTEMB 2001 %d %M %Y 2001-09-15 00:00:00
		@@ -211,6 +211,13 @@ Tuesday 52 2001 %W %V %X 2002-01-01 00:00:00
		15-01-2001 %d-%m-%Y %H:%i:%S 2001-01-15 00:00:00
		15-01-20 %d-%m-%y 2020-01-15 00:00:00
		15-2001-1 %d-%Y-%c 2001-01-15 00:00:00
		Warnings:
		Warning 1292 Incorrect datetime value: '0000-00-00 10:20:10'
		Warning 1292 Incorrect datetime value: '0000-00-00 10:20:10'
		Warning 1292 Incorrect datetime value: '0000-00-00 10:20:10'
		Warning 1292 Incorrect datetime value: '0000-00-00 10:20:10'
		Warning 1292 Incorrect datetime value: '0000-00-00 10:20:10'
		Warning 1292 Incorrect datetime value: '0000-00-00 10:20:10.440000'
		select date,format,DATE(str_to_date(date, format)) as date2 from t1;
		date format date2
		2003-01-02 10:11:12 %Y-%m-%d %H:%i:%S 2003-01-02
		@@ -251,12 +258,12 @@ date format time
		2003-01-02 02:11:12.12345AM %Y-%m-%d %h:%i:%S.%f %p 02:11:12.123450
		2003-01-02 12:11:12.12345 am %Y-%m-%d %h:%i:%S.%f%p 00:11:12.123450
		2003-01-02 11:11:12Pm %Y-%m-%d %h:%i:%S%p 23:11:12
		10:20:10 %H:%i:%s 10:20:10
		10:20:10 %h:%i:%s.%f 10:20:10
		10:20:10 %T 10:20:10
		10:20:10AM %h:%i:%s%p 10:20:10
		10:20:10AM %r 10:20:10
		10:20:10.44AM %h:%i:%s.%f%p 10:20:10.440000
		10:20:10 %H:%i:%s NULL
		10:20:10 %h:%i:%s.%f NULL
		10:20:10 %T NULL
		10:20:10AM %h:%i:%s%p NULL
		10:20:10AM %r NULL
		10:20:10.44AM %h:%i:%s.%f%p NULL
		15-01-2001 12:59:58 %d-%m-%Y %H:%i:%S 12:59:58
		15 September 2001 %d %M %Y 00:00:00
		15 SEPTEMB 2001 %d %M %Y 00:00:00
		@@ -273,6 +280,13 @@ Tuesday 52 2001 %W %V %X 00:00:00
		15-01-2001 %d-%m-%Y %H:%i:%S 00:00:00
		15-01-20 %d-%m-%y 00:00:00
		15-2001-1 %d-%Y-%c 00:00:00
		Warnings:
		Warning 1292 Truncated incorrect time value: '0000-00-00 10:20:10'
		Warning 1292 Truncated incorrect time value: '0000-00-00 10:20:10'
		Warning 1292 Truncated incorrect time value: '0000-00-00 10:20:10'
		Warning 1292 Truncated incorrect time value: '0000-00-00 10:20:10'
		Warning 1292 Truncated incorrect time value: '0000-00-00 10:20:10'
		Warning 1292 Truncated incorrect time value: '0000-00-00 10:20:10.440000'
		select date,format,concat(TIME(str_to_date(date, format))) as time2 from t1;
		date format time2
		2003-01-02 10:11:12 %Y-%m-%d %H:%i:%S 10:11:12
		@@ -282,12 +296,12 @@ date format time2
		2003-01-02 02:11:12.12345AM %Y-%m-%d %h:%i:%S.%f %p 02:11:12.123450
		2003-01-02 12:11:12.12345 am %Y-%m-%d %h:%i:%S.%f%p 00:11:12.123450
		2003-01-02 11:11:12Pm %Y-%m-%d %h:%i:%S%p 23:11:12
		10:20:10 %H:%i:%s 10:20:10
		10:20:10 %h:%i:%s.%f 10:20:10
		10:20:10 %T 10:20:10
		10:20:10AM %h:%i:%s%p 10:20:10
		10:20:10AM %r 10:20:10
		10:20:10.44AM %h:%i:%s.%f%p 10:20:10.440000
		10:20:10 %H:%i:%s NULL
		10:20:10 %h:%i:%s.%f NULL
		10:20:10 %T NULL
		10:20:10AM %h:%i:%s%p NULL
		10:20:10AM %r NULL
		10:20:10.44AM %h:%i:%s.%f%p NULL
		15-01-2001 12:59:58 %d-%m-%Y %H:%i:%S 12:59:58
		15 September 2001 %d %M %Y 00:00:00
		15 SEPTEMB 2001 %d %M %Y 00:00:00
		@@ -304,6 +318,13 @@ Tuesday 52 2001 %W %V %X 00:00:00
		15-01-2001 %d-%m-%Y %H:%i:%S 00:00:00
		15-01-20 %d-%m-%y 00:00:00
		15-2001-1 %d-%Y-%c 00:00:00
		Warnings:
		Warning 1292 Truncated incorrect time value: '0000-00-00 10:20:10'
		Warning 1292 Truncated incorrect time value: '0000-00-00 10:20:10'
		Warning 1292 Truncated incorrect time value: '0000-00-00 10:20:10'
		Warning 1292 Truncated incorrect time value: '0000-00-00 10:20:10'
		Warning 1292 Truncated incorrect time value: '0000-00-00 10:20:10'
		Warning 1292 Truncated incorrect time value: '0000-00-00 10:20:10.440000'
		select concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d'));
		concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d'))
		2003-01-02 08:11:02.123456
		@@ -574,4 +595,13 @@ DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896)
		NULL
		Warnings:
		Warning 1292 Incorrect datetime value: '%Y-%m-%d %H:%i:%s'
		select str_to_date('04 /30/2004', '%m /%d/%Y');
		str_to_date('04 /30/2004', '%m /%d/%Y')
		2004-04-30
		select str_to_date('04/30 /2004', '%m /%d /%Y');
		str_to_date('04/30 /2004', '%m /%d /%Y')
		2004-04-30
		select str_to_date('04/30/2004 ', '%m/%d/%Y ');
		str_to_date('04/30/2004 ', '%m/%d/%Y ')
		2004-04-30
		"End of 4.1 tests"

mysql-test/r/mysql.result

+2 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@ Tables_in_test
		t1
		t2
		t3
		Tables_in_test
		t1
		_
		Test delimiter : from command line
		a

mysql-test/t/date_formats.test

+8 −0

Original line number	Diff line number	Diff line
		@@ -329,4 +329,12 @@ SELECT TIME_FORMAT("25:00:00", '%l %p');
		#
		SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896);

		#
		# Bug #22029: str_to_date returning NULL
		#

		select str_to_date('04 /30/2004', '%m /%d/%Y');
		select str_to_date('04/30 /2004', '%m /%d /%Y');
		select str_to_date('04/30/2004 ', '%m/%d/%Y ');

		--echo "End of 4.1 tests"

mysql-test/t/events_bugs.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -280,7 +280,7 @@ create event e22830_3 on schedule every 1 hour do alter event e22830_3 on schedu
		create event e22830_4 on schedule every 1 hour do alter event e22830_4 on schedule every (select f22830() from dual) hour;
		select event_name, event_definition, interval_value, interval_field from information_schema.events order by event_name;
		set global event_scheduler=on;
		--sleep 0.7
		--sleep 2.4
		set global event_scheduler=off;
		select event_name, event_definition, interval_value, interval_field from information_schema.events order by event_name;
		drop function f22830;