bk commit into 4.1 tree (aivanov:1.2474)

[Alex Ivanov]

Below is the list of changes that have just been committed into a local
4.1 repository of alexi. When alexi does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2474 06/01/10 17:57:46 aivanov@stripped +2 -0
  Commenting out testcases which cause type_time.test failure.
   To be uncommented after fixing bug 15805.

  mysql-test/t/type_time.test
    1.8 06/01/10 17:55:54 aivanov@stripped +10 -6
    Temporaly commented out testcases which cause type_time.test failure.
     To be uncommented after fixing bug 15805.

  mysql-test/r/type_time.result
    1.14 06/01/10 17:55:54 aivanov@stripped +0 -24
    Fixing testcases results.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aivanov
# Host:	mysql.creware.com
# Root:	/home/alexi/dev/mysql-4.1-15805

--- 1.13/mysql-test/r/type_time.result	2005-12-15 18:48:01 +03:00
+++ 1.14/mysql-test/r/type_time.result	2006-01-10 17:55:54 +03:00
@@ -85,27 +85,3 @@
 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'

--- 1.7/mysql-test/t/type_time.test	2005-12-15 18:48:01 +03:00
+++ 1.8/mysql-test/t/type_time.test	2006-01-10 17:55:54 +03:00
@@ -26,13 +26,17 @@
 # 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