Merge bk-internal:/home/bk/mysql-4.1 (b2219897) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/func_time.result

+21 −0

Original line number	Diff line number	Diff line
		@@ -695,3 +695,24 @@ t1 CREATE TABLE `t1` (
		`from_unixtime(1) + 0` double(23,6) default NULL
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		drop table t1;
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H)
		union
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H);
		H
		120
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%k') As H)
		union
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%k') As H);
		H
		120
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%H') As H)
		union
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%H') As H);
		H
		05
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H)
		union
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H);
		H
		5
		End of 4.1 tests

mysql-test/r/mysql_client.result

+0 −44

Original line number	Diff line number	Diff line
		@@ -2,47 +2,3 @@
		1
		ERROR 1064 (42000) at line 3: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
		ERROR at line 1: USE must be followed by a database name
		? (\?) Synonym for `help'.
		clear (\c) Clear command.
		connect (\r) Reconnect to the server. Optional arguments are db and host.
		delimiter (\d) Set query delimiter.
		edit (\e) Edit command with $EDITOR.
		ego (\G) Send command to mysql server, display result vertically.
		exit (\q) Exit mysql. Same as quit.
		go (\g) Send command to mysql server.
		help (\h) Display this help.
		nopager (\n) Disable pager, print to stdout.
		notee (\t) Don't write into outfile.
		pager (\P) Set PAGER [to_pager]. Print the query results via PAGER.
		print (\p) Print current command.
		prompt (\R) Change your mysql prompt.
		quit (\q) Quit mysql.
		rehash (\#) Rebuild completion hash.
		source (\.) Execute an SQL script file. Takes a file name as an argument.
		status (\s) Get status information from the server.
		system (\!) Execute a system shell command.
		tee (\T) Set outfile [to_outfile]. Append everything into given outfile.
		use (\u) Use another database. Takes database name as argument.
		charset_name(\C) Switch to another charset. Might be needed for processing binlog.
		? (\?) Synonym for `help'.
		clear (\c) Clear command.
		connect (\r) Reconnect to the server. Optional arguments are db and host.
		delimiter (\d) Set query delimiter.
		edit (\e) Edit command with $EDITOR.
		ego (\G) Send command to mysql server, display result vertically.
		exit (\q) Exit mysql. Same as quit.
		go (\g) Send command to mysql server.
		help (\h) Display this help.
		nopager (\n) Disable pager, print to stdout.
		notee (\t) Don't write into outfile.
		pager (\P) Set PAGER [to_pager]. Print the query results via PAGER.
		print (\p) Print current command.
		prompt (\R) Change your mysql prompt.
		quit (\q) Quit mysql.
		rehash (\#) Rebuild completion hash.
		source (\.) Execute an SQL script file. Takes a file name as an argument.
		status (\s) Get status information from the server.
		system (\!) Execute a system shell command.
		tee (\T) Set outfile [to_outfile]. Append everything into given outfile.
		use (\u) Use another database. Takes database name as argument.
		charset_name(\C) Switch to another charset. Might be needed for processing binlog.

mysql-test/t/func_time.test

+19 −1

Original line number	Diff line number	Diff line
		@@ -368,4 +368,22 @@ create table t1 select now() - now(), curtime() - curtime(),
		show create table t1;
		drop table t1;

		# End of 4.1 tests
		#
		# Bug #19844 time_format in Union truncates values
		#

		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H)
		union
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H);
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%k') As H)
		union
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%k') As H);
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%H') As H)
		union
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%H') As H);

		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H)
		union
		(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H);

		--echo End of 4.1 tests

mysql-test/t/mysql_client.test

+3 −3

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1

		#
		# Bug #20328: mysql client interprets commands in comments
		# Bug #20328: mysql client: dumb about trailing spaces on 'help' command
		#
		--exec echo 'help' \| $MYSQL
		--exec echo 'help ' \| $MYSQL
		--exec echo 'help' \| $MYSQL > $MYSQLTEST_VARDIR/tmp/bug20328.tmp
		--exec echo 'help ' \| $MYSQL > $MYSQLTEST_VARDIR/tmp/bug20328.tmp

sql/item_timefunc.cc

+4 −2

Original line number	Diff line number	Diff line
		@@ -1600,14 +1600,12 @@ uint Item_func_date_format::format_length(const String *format)
		case 'u': /* week (00..52), where week starts with Monday */
		case 'V': /* week 1..53 used with 'x' */
		case 'v': /* week 1..53 used with 'x', where week starts with Monday */
		case 'H': /* hour (00..23) */
		case 'y': /* year, numeric, 2 digits */
		case 'm': /* month, numeric */
		case 'd': /* day (of the month), numeric */
		case 'h': /* hour (01..12) */
		case 'I': /* --\|\|-- */
		case 'i': /* minutes, numeric */
		case 'k': /* hour ( 0..23) */
		case 'l': /* hour ( 1..12) */
		case 'p': /* locale's AM or PM */
		case 'S': /* second (00..61) */
		@@ -1616,6 +1614,10 @@ uint Item_func_date_format::format_length(const String *format)
		case 'e': /* day (0..31) */
		size += 2;
		break;
		case 'k': /* hour ( 0..23) */
		case 'H': /* hour (00..23; value > 23 OK, padding always 2-digit) */
		size += 7; /* docs allow > 23, range depends on sizeof(unsigned int) */
		break;
		case 'r': /* time, 12-hour (hh:mm:ss [AP]M) */
		size += 11;
		break;