Browse Source

ps-protocol fix

pull/374/head
Sergei Golubchik 15 years ago
parent
commit
e2d71ef3e6
  1. 5
      mysql-test/r/func_time.result
  2. 1
      mysql-test/t/func_time.test

5
mysql-test/r/func_time.result

@ -1483,11 +1483,6 @@ Warnings:
Warning 1292 Incorrect datetime value: '0'
Warning 1292 Incorrect datetime value: '0'
drop table t1;
select timediff('0000-00-00 00:00:00', cast('2008-03-26 07:09:06' as datetime));
timediff('0000-00-00 00:00:00', cast('2008-03-26 07:09:06' as datetime))
-838:59:59.999999
Warnings:
Warning 1292 Truncated incorrect time value: '-596523:14:07'
select convert_tz(timediff('0000-00-00 00:00:00', cast('2008-03-26 07:09:06' as datetime)), 'UTC', 'Europe/Moscow');
convert_tz(timediff('0000-00-00 00:00:00', cast('2008-03-26 07:09:06' as datetime)), 'UTC', 'Europe/Moscow')
NULL

1
mysql-test/t/func_time.test

@ -920,7 +920,6 @@ drop table t1;
#
# lp:731815 Crash/valgrind warning Item::send with 5.1-micro
#
select timediff('0000-00-00 00:00:00', cast('2008-03-26 07:09:06' as datetime));
select convert_tz(timediff('0000-00-00 00:00:00', cast('2008-03-26 07:09:06' as datetime)), 'UTC', 'Europe/Moscow');
#

Loading…
Cancel
Save