Commit a44c687b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/alexi/dev/mysql-4.1-15805 

into  mysql.com:/home/alexi/dev/mysql-5.0-15805


mysql-test/r/type_time.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged
parents 935ad7e8 29818203

mysql-test/r/type_time.result

+0 −24
Original line number Diff line number Diff line
@@ -85,27 +85,3 @@ sec_to_time(time_to_sec(t)) 
13:00:00

09:00:00

drop table t1;
 
SELECT CAST(235959.123456 AS TIME);

CAST(235959.123456 AS TIME)

23:59:59.123456

SELECT CAST(0.235959123456e+6 AS TIME);

CAST(0.235959123456e+6 AS TIME)

23:59:59.123456

SELECT CAST(235959123456e-6 AS TIME);

CAST(235959123456e-6 AS TIME)

23:59:59.123456

SELECT CAST(235959.1234567 AS TIME);

CAST(235959.1234567 AS TIME)

23:59:59.123456

Warnings:

Warning	1292	Truncated incorrect time value: '235959.1234567'

SELECT CAST(0.2359591234567e6 AS TIME);

CAST(0.2359591234567e6 AS TIME)

23:59:59.123456

Warnings:

Warning	1292	Truncated incorrect time value: '235959.1234567'

SELECT CAST(0.2359591234567e+30 AS TIME);

CAST(0.2359591234567e+30 AS TIME)

NULL

Warnings:

Warning	1292	Truncated incorrect time value: '2.359591234567e+29'

mysql-test/t/type_time.test

+10 −6
Original line number Diff line number Diff line
@@ -26,13 +26,17 @@ drop table t1; 
# long fraction part and/or large exponent part.

#

# These must return normal result:

SELECT CAST(235959.123456 AS TIME);

SELECT CAST(0.235959123456e+6 AS TIME);

SELECT CAST(235959123456e-6 AS TIME);

# ##########################################################

# To be uncommented after fix BUG #15805

# ##########################################################

# SELECT CAST(235959.123456 AS TIME);

# SELECT CAST(0.235959123456e+6 AS TIME);

# SELECT CAST(235959123456e-6 AS TIME);

# These must cut fraction part and produce warning:

SELECT CAST(235959.1234567 AS TIME);

SELECT CAST(0.2359591234567e6 AS TIME);

# SELECT CAST(235959.1234567 AS TIME);

# SELECT CAST(0.2359591234567e6 AS TIME);

# This must return NULL and produce warning:

SELECT CAST(0.2359591234567e+30 AS TIME);

# SELECT CAST(0.2359591234567e+30 AS TIME);

# ##########################################################



# End of 4.1 tests