diff options
author | unknown <monty@donna.mysql.com> | 2000-12-28 03:56:38 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-12-28 03:56:38 +0200 |
commit | f537319d4279cad17072d72bf8b7324af92e610e (patch) | |
tree | c27e400395741740f2e230395445236b38db27c1 /mysql-test/r/func_time.result | |
parent | e56db85890820c4e12db2509f3644ac9b4c162bc (diff) | |
download | mariadb-git-f537319d4279cad17072d72bf8b7324af92e610e.tar.gz |
Added support for hex strings to mysqlimport
A lot of new tests to mysqltest
Fixed bug with BDB tables and autocommit
BitKeeper/deleted/.del-delete.test~389410e29f2cebe5:
Delete: mysql-test/t/delete.test
BitKeeper/deleted/.del-delete.result~e866a6678e29f186:
Delete: mysql-test/r/delete.result
BitKeeper/deleted/.del-sel000014.test~74cb8c70f1d73fcc:
Delete: mysql-test/t/sel000014.test
BitKeeper/deleted/.del-sel000015.test~7442bf9cbc96fe07:
Delete: mysql-test/t/sel000015.test
BitKeeper/deleted/.del-sel000016.test~f495235f14c47ec:
Delete: mysql-test/t/sel000016.test
BitKeeper/deleted/.del-sel000017.test~7c39f2b45a6aa780:
Delete: mysql-test/t/sel000017.test
BitKeeper/deleted/.del-sel000018.test~16207f3ad74de75e:
Delete: mysql-test/t/sel000018.test
BitKeeper/deleted/.del-sel000014.result~fc8de0ec89d9e35:
Delete: mysql-test/r/sel000014.result
BitKeeper/deleted/.del-sel000015.result~cadbc52051d47bac:
Delete: mysql-test/r/sel000015.result
BitKeeper/deleted/.del-sel000016.result~6177851869bd5b07:
Delete: mysql-test/r/sel000016.result
BitKeeper/deleted/.del-sel000017.result~84ebf147850ff31c:
Delete: mysql-test/r/sel000017.result
BitKeeper/deleted/.del-sel000018.result~562ac9094cf53aba:
Delete: mysql-test/r/sel000018.result
BitKeeper/deleted/.del-sel000005.test~982fde89a4d6d886:
Delete: mysql-test/t/sel000005.test
BitKeeper/deleted/.del-sel000006.test~291cc6c8d85e51df:
Delete: mysql-test/t/sel000006.test
BitKeeper/deleted/.del-sel000005.result~d5410bb765199cc5:
Delete: mysql-test/r/sel000005.result
BitKeeper/deleted/.del-sel000006.result~d38004d1acfc11a5:
Delete: mysql-test/r/sel000006.result
BitKeeper/deleted/.del-sel000004.test~daf9ad4a1a31cd3c:
Delete: mysql-test/t/sel000004.test
BitKeeper/deleted/.del-sel000007.test~f431e4f4739a24c3:
Delete: mysql-test/t/sel000007.test
BitKeeper/deleted/.del-sel000008.test~b338ef585cadf7ae:
Delete: mysql-test/t/sel000008.test
BitKeeper/deleted/.del-sel000009.test~a455c38f5c942cd1:
Delete: mysql-test/t/sel000009.test
BitKeeper/deleted/.del-sel000010.test~ca07085ae92255f1:
Delete: mysql-test/t/sel000010.test
BitKeeper/deleted/.del-sel000011.test~c2a971726c9d18d6:
Delete: mysql-test/t/sel000011.test
BitKeeper/deleted/.del-sel000012.test~ae64bff363c42e92:
Delete: mysql-test/t/sel000012.test
BitKeeper/deleted/.del-sel000013.test~ce8aa504ba4f74ba:
Delete: mysql-test/t/sel000013.test
BitKeeper/deleted/.del-sel000019.test~8fd63c8dc6be8dbc:
Delete: mysql-test/t/sel000019.test
BitKeeper/deleted/.del-sel000020.test~c5758ad18a6dff1e:
Delete: mysql-test/t/sel000020.test
BitKeeper/deleted/.del-sel000021.test~94dd47de2872264a:
Delete: mysql-test/t/sel000021.test
BitKeeper/deleted/.del-sel000022.test~6e3e5435e66875e9:
Delete: mysql-test/t/sel000022.test
BitKeeper/deleted/.del-sel000023.test~7bdfcfaa278f837d:
Delete: mysql-test/t/sel000023.test
BitKeeper/deleted/.del-sel000024.test~849f47e6cbdc4fe3:
Delete: mysql-test/t/sel000024.test
BitKeeper/deleted/.del-sel000025.test~65b32b4b67e4c77:
Delete: mysql-test/t/sel000025.test
BitKeeper/deleted/.del-sel000026.test~d8aa2d614f23b1:
Delete: mysql-test/t/sel000026.test
BitKeeper/deleted/.del-sel000027.test~ab44bb57a580de9:
Delete: mysql-test/t/sel000027.test
BitKeeper/deleted/.del-sel000028.test~db9bfc0a808fb629:
Delete: mysql-test/t/sel000028.test
BitKeeper/deleted/.del-sel000029.test~6aae34dbb3ee86d9:
Delete: mysql-test/t/sel000029.test
BitKeeper/deleted/.del-sel000030.test~a29683eac3e7b706:
Delete: mysql-test/t/sel000030.test
BitKeeper/deleted/.del-sel000004.result~1f8d1265be521c17:
Delete: mysql-test/r/sel000004.result
BitKeeper/deleted/.del-sel000007.result~df455e49f9727c4f:
Delete: mysql-test/r/sel000007.result
BitKeeper/deleted/.del-sel000008.result~67a459ff62c84d6a:
Delete: mysql-test/r/sel000008.result
BitKeeper/deleted/.del-sel000009.result~e042b35ab131fb3:
Delete: mysql-test/r/sel000009.result
BitKeeper/deleted/.del-sel000010.result~eee5b9631a1e0066:
Delete: mysql-test/r/sel000010.result
BitKeeper/deleted/.del-sel000011.result~6907fe356973ed25:
Delete: mysql-test/r/sel000011.result
BitKeeper/deleted/.del-sel000012.result~be18991fc28954c2:
Delete: mysql-test/r/sel000012.result
BitKeeper/deleted/.del-sel000013.result~513389e06c96af73:
Delete: mysql-test/r/sel000013.result
BitKeeper/deleted/.del-sel000019.result~2870fe1c4998d929:
Delete: mysql-test/r/sel000019.result
BitKeeper/deleted/.del-sel000020.result~faa670294ef5fa91:
Delete: mysql-test/r/sel000020.result
BitKeeper/deleted/.del-sel000021.result~8f0ce4ec26e0c21d:
Delete: mysql-test/r/sel000021.result
BitKeeper/deleted/.del-sel000022.result~34828a43753ee767:
Delete: mysql-test/r/sel000022.result
BitKeeper/deleted/.del-sel000023.result~13e112d77573bf17:
Delete: mysql-test/r/sel000023.result
BitKeeper/deleted/.del-sel000024.result~b10d449624f48d07:
Delete: mysql-test/r/sel000024.result
BitKeeper/deleted/.del-sel000025.result~f31e08fcca805f35:
Delete: mysql-test/r/sel000025.result
BitKeeper/deleted/.del-sel000026.result~854fa951666b7982:
Delete: mysql-test/r/sel000026.result
BitKeeper/deleted/.del-sel000027.result~cfd73fe738f27da:
Delete: mysql-test/r/sel000027.result
BitKeeper/deleted/.del-sel000028.result~13ff5add6ac24908:
Delete: mysql-test/r/sel000028.result
BitKeeper/deleted/.del-sel000029.result~c6d071781808aa26:
Delete: mysql-test/r/sel000029.result
BitKeeper/deleted/.del-sel000030.result~98d496948e15064d:
Delete: mysql-test/r/sel000030.result
BitKeeper/deleted/.del-alt000001.test~633aed61c4bad94c:
Delete: mysql-test/t/alt000001.test
BitKeeper/deleted/.del-alt000001.result~393103dbf15f35c9:
Delete: mysql-test/r/alt000001.result
BitKeeper/deleted/.del-mrg000001.dummy.result~bf7e6d609f22b897:
Delete: mysql-test/r/mrg000001.dummy.result
BitKeeper/deleted/.del-mrg000001.result~db2ef2e717ab8332:
Delete: mysql-test/r/mrg000001.result
BitKeeper/deleted/.del-mrg000002.result~745be0854aaaaf5e:
Delete: mysql-test/r/mrg000002.result
BitKeeper/deleted/.del-mrg000001.test~e0327f9d1e6cb4e:
Delete: mysql-test/t/mrg000001.test
BitKeeper/deleted/.del-mrg000002.test~16b3a176adc0f311:
Delete: mysql-test/t/mrg000002.test
Docs/manual.texi:
Changelog
client/mysqlimport.c:
Added support for hex strings
client/mysqltest.c:
Added linenumbers in output
Only allow '{' first on a row (Conflicts with ODBC {} syntax).
Handle bigger queries.
Handle double ''
Truncate result files.
mysql-test/mysql-test-run.sh:
Added --verbose
cleanup
mysql-test/r/bdb.result:
Updating of test
mysql-test/r/func_crypt.result:
Updating of test
mysql-test/r/func_equal.result:
Updating of test
mysql-test/r/func_str.result:
Updating of test
mysql-test/r/ins000001.result:
Updating of test
mysql-test/t/bdb.test:
Updating of test
mysql-test/t/err000001.test:
Updating of test
mysql-test/t/func_crypt.test:
Updating of test
mysql-test/t/func_equal.test:
Updating of test
mysql-test/t/func_str.test:
Updating of test
mysql-test/t/ins000001.test:
Updating of test
sql/gen_lex_hash.cc:
Smaller table
sql/handler.cc:
Fixed bug in auto_commit
Diffstat (limited to 'mysql-test/r/func_time.result')
-rw-r--r-- | mysql-test/r/func_time.result | 186 |
1 files changed, 186 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result new file mode 100644 index 00000000000..c132c7dba8e --- /dev/null +++ b/mysql-test/r/func_time.result @@ -0,0 +1,186 @@ +from_days(to_days("960101")) to_days(960201)-to_days("19960101") to_days(date_add(curdate(), interval 1 day))-to_days(curdate()) weekday("1997-11-29") +1996-01-01 31 1 5 +period_add("9602",-12) period_diff(199505,"9404") +199502 13 +now()-now() weekday(curdate())-weekday(now()) unix_timestamp()-unix_timestamp(now()) +0 0 0 +from_unixtime(unix_timestamp("1994-03-02 10:11:12")) from_unixtime(unix_timestamp("1994-03-02 10:11:12"),"%Y-%m-%d %h:%i:%s") from_unixtime(unix_timestamp("1994-03-02 10:11:12"))+0 +1994-03-02 10:11:12 1994-03-02 10:11:12 19940302101112 +sec_to_time(9001) sec_to_time(9001)+0 time_to_sec("15:12:22") +02:30:01 23001 54742 +now()-curdate()*1000000-curtime() +0 +strcmp(current_timestamp(),concat(current_date()," ",current_time())) +0 +date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w") +January Thursday 2nd 1997 97 01 02 03 04 05 4 +date_format("1997-01-02", concat("%M %W %D ","%Y %y %m %d %h %i %s %w")) +January Thursday 2nd 1997 97 01 02 12 00 00 4 +dayofmonth("1997-01-02") dayofmonth(19970323) +2 23 +month("1997-01-02") year("98-02-03") dayofyear("1997-12-31") +1 1998 365 +DAYOFYEAR("1997-03-03") WEEK("1998-03-03") QUARTER(980303) +62 9 1 +HOUR("1997-03-03 23:03:22") MINUTE("23:03:22") SECOND(230322) +23 3 22 +week(19980101) week(19970101) week(19980101,1) week(19970101,1) +0 1 1 1 +week(19981231) week(19971231) week(19981231,1) week(19971231,1) +52 53 53 53 +week(19950101) week(19950101,1) +1 0 +yearweek('1981-12-31',1) yearweek('1982-01-01',1) yearweek('1982-12-31',1) yearweek('1983-01-01',1) +198153 198153 198252 198252 +date_format('1998-12-31','%x-%v') date_format('1999-01-01','%x-%v') +1998-53 1998-53 +date_format('1999-12-31','%x-%v') date_format('2000-01-01','%x-%v') +1999-52 1999-52 +yearweek('1987-01-01',1) yearweek('1987-01-01') +198701 198653 +dayname("1962-03-03") dayname("1962-03-03")+0 +Saturday 5 +monthname("1972-03-04") monthname("1972-03-04")+0 +March 3 +time_format(19980131000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T') +00|12|0|12|00|AM|12:00:00 AM|00|00:00:00 +time_format(19980131010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T') +01|01|1|1|02|AM|01:02:03 AM|03|01:02:03 +time_format(19980131131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T') +13|01|13|1|14|PM|01:14:15 PM|15|13:14:15 +time_format(19980131010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T') +01|01|1|1|00|AM|01:00:15 AM|15|01:00:15 +date_format(concat('19980131',131415),'%H|%I|%k|%l|%i|%p|%r|%S|%T| %M|%W|%D|%Y|%y|%a|%b|%j|%m|%d|%h|%s|%w') +13|01|13|1|14|PM|01:14:15 PM|15|13:14:15| January|Saturday|31st|1998|98|Sat|Jan|031|01|31|01|15|6 +date_format(19980021000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T| %M|%W|%D|%Y|%y|%a|%b|%j|%m|%d|%h|%s|%w') +NULL +date_add("1997-12-31 23:59:59",INTERVAL 1 SECOND) +1998-01-01 00:00:00 +date_add("1997-12-31 23:59:59",INTERVAL 1 MINUTE) +1998-01-01 00:00:59 +date_add("1997-12-31 23:59:59",INTERVAL 1 HOUR) +1998-01-01 00:59:59 +date_add("1997-12-31 23:59:59",INTERVAL 1 DAY) +1998-01-01 23:59:59 +date_add("1997-12-31 23:59:59",INTERVAL 1 MONTH) +1998-01-31 23:59:59 +date_add("1997-12-31 23:59:59",INTERVAL 1 YEAR) +1998-12-31 23:59:59 +date_add("1997-12-31 23:59:59",INTERVAL "1:1" MINUTE_SECOND) +1998-01-01 00:01:00 +date_add("1997-12-31 23:59:59",INTERVAL "1:1" HOUR_MINUTE) +1998-01-01 01:00:59 +date_add("1997-12-31 23:59:59",INTERVAL "1:1" DAY_HOUR) +1998-01-02 00:59:59 +date_add("1997-12-31 23:59:59",INTERVAL "1 1" YEAR_MONTH) +1999-01-31 23:59:59 +date_add("1997-12-31 23:59:59",INTERVAL "1:1:1" HOUR_SECOND) +1998-01-01 01:01:00 +date_add("1997-12-31 23:59:59",INTERVAL "1 1:1" DAY_MINUTE) +1998-01-02 01:00:59 +date_add("1997-12-31 23:59:59",INTERVAL "1 1:1:1" DAY_SECOND) +1998-01-02 01:01:00 +date_sub("1998-01-01 00:00:00",INTERVAL 1 SECOND) +1997-12-31 23:59:59 +date_sub("1998-01-01 00:00:00",INTERVAL 1 MINUTE) +1997-12-31 23:59:00 +date_sub("1998-01-01 00:00:00",INTERVAL 1 HOUR) +1997-12-31 23:00:00 +date_sub("1998-01-01 00:00:00",INTERVAL 1 DAY) +1997-12-31 00:00:00 +date_sub("1998-01-01 00:00:00",INTERVAL 1 MONTH) +1997-12-01 00:00:00 +date_sub("1998-01-01 00:00:00",INTERVAL 1 YEAR) +1997-01-01 00:00:00 +date_sub("1998-01-01 00:00:00",INTERVAL "1:1" MINUTE_SECOND) +1997-12-31 23:58:59 +date_sub("1998-01-01 00:00:00",INTERVAL "1:1" HOUR_MINUTE) +1997-12-31 22:59:00 +date_sub("1998-01-01 00:00:00",INTERVAL "1:1" DAY_HOUR) +1997-12-30 23:00:00 +date_sub("1998-01-01 00:00:00",INTERVAL "1 1" YEAR_MONTH) +1996-12-01 00:00:00 +date_sub("1998-01-01 00:00:00",INTERVAL "1:1:1" HOUR_SECOND) +1997-12-31 22:58:59 +date_sub("1998-01-01 00:00:00",INTERVAL "1 1:1" DAY_MINUTE) +1997-12-30 22:59:00 +date_sub("1998-01-01 00:00:00",INTERVAL "1 1:1:1" DAY_SECOND) +1997-12-30 22:58:59 +date_add("1997-12-31 23:59:59",INTERVAL 100000 SECOND) +1998-01-02 03:46:39 +date_add("1997-12-31 23:59:59",INTERVAL -100000 MINUTE) +1997-10-23 13:19:59 +date_add("1997-12-31 23:59:59",INTERVAL 100000 HOUR) +2009-05-29 15:59:59 +date_add("1997-12-31 23:59:59",INTERVAL -100000 DAY) +1724-03-17 23:59:59 +date_add("1997-12-31 23:59:59",INTERVAL 100000 MONTH) +NULL +date_add("1997-12-31 23:59:59",INTERVAL -100000 YEAR) +NULL +date_add("1997-12-31 23:59:59",INTERVAL "10000:1" MINUTE_SECOND) +1998-01-07 22:40:00 +date_add("1997-12-31 23:59:59",INTERVAL "-10000:1" HOUR_MINUTE) +1996-11-10 07:58:59 +date_add("1997-12-31 23:59:59",INTERVAL "10000:1" DAY_HOUR) +2025-05-19 00:59:59 +date_add("1997-12-31 23:59:59",INTERVAL "-100 1" YEAR_MONTH) +1897-11-30 23:59:59 +date_add("1997-12-31 23:59:59",INTERVAL "10000:99:99" HOUR_SECOND) +1999-02-21 17:40:38 +date_add("1997-12-31 23:59:59",INTERVAL " -10000 99:99" DAY_MINUTE) +1970-08-11 19:20:59 +date_add("1997-12-31 23:59:59",INTERVAL "10000 99:99:99" DAY_SECOND) +2025-05-23 04:40:38 +"1997-12-31 23:59:59" + INTERVAL 1 SECOND +1998-01-01 00:00:00 +INTERVAL 1 DAY + "1997-12-31" +1998-01-01 +"1998-01-01 00:00:00" - INTERVAL 1 SECOND +1997-12-31 23:59:59 +date_sub("1998-01-02",INTERVAL 31 DAY) +1997-12-02 +date_add("1997-12-31",INTERVAL 1 SECOND) +1997-12-31 00:00:01 +date_add("1997-12-31",INTERVAL 1 DAY) +1998-01-01 +date_add(NULL,INTERVAL 100000 SECOND) +NULL +date_add("1997-12-31 23:59:59",INTERVAL NULL SECOND) +NULL +date_add("1997-12-31 23:59:59",INTERVAL NULL MINUTE_SECOND) +NULL +date_add("9999-12-31 23:59:59",INTERVAL 1 SECOND) +NULL +date_sub("0000-00-00 00:00:00",INTERVAL 1 SECOND) +NULL +date_add('1998-01-30',Interval 1 month) +1998-02-28 +date_add('1998-01-30',Interval '2:1' year_month) +2000-02-29 +date_add('1996-02-29',Interval '1' year) +1997-02-28 +extract(YEAR FROM "1999-01-02 10:11:12") +1999 +extract(YEAR_MONTH FROM "1999-01-02") +199901 +extract(DAY FROM "1999-01-02") +2 +extract(DAY_HOUR FROM "1999-01-02 10:11:12") +210 +extract(DAY_MINUTE FROM "02 10:11:12") +21011 +extract(DAY_SECOND FROM "225 10:11:12") +225101112 +extract(HOUR FROM "1999-01-02 10:11:12") +10 +extract(HOUR_MINUTE FROM "10:11:12") +1011 +extract(HOUR_SECOND FROM "10:11:12") +101112 +extract(MINUTE FROM "10:11:12") +11 +extract(MINUTE_SECOND FROM "10:11:12") +1112 +extract(SECOND FROM "1999-01-02 10:11:12") +12 |