diff options
| author | kaa@polly.local <> | 2006-10-12 11:21:12 +0400 |
|---|---|---|
| committer | kaa@polly.local <> | 2006-10-12 11:21:12 +0400 |
| commit | e89fdaac73eaec0b7b23bbfcbeef1d73fc8be3b6 (patch) | |
| tree | 7ee0ac7f1ee65b97bf819d82086120b02d5436e6 | |
| parent | 02ac635027a89b59e537d1c893a634a15efcb888 (diff) | |
| download | mariadb-git-e89fdaac73eaec0b7b23bbfcbeef1d73fc8be3b6.tar.gz | |
5.0-specific fixes when merging the fix for bug #11655 and bug #20927 from 4.1
| -rw-r--r-- | mysql-test/r/func_time.result | 2 | ||||
| -rw-r--r-- | sql/item_timefunc.cc | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 0a766fcdc63..91bd3722299 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -898,7 +898,7 @@ CREATE TABLE t1(f1 TIME); INSERT INTO t1 VALUES('916:00:00 a'); Warnings: Warning 1265 Data truncated for column 'f1' at row 1 -Warning 1264 Data truncated; out of range for column 'f1' at row 1 +Warning 1264 Out of range value adjusted for column 'f1' at row 1 SELECT * FROM t1; f1 838:59:59 diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index e320275f53d..35cffa9c542 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -120,7 +120,7 @@ static bool make_datetime_with_warn(date_time_format_types format, TIME *ltime, return 0; make_truncated_value_warning(current_thd, str->ptr(), str->length(), - MYSQL_TIMESTAMP_TIME); + MYSQL_TIMESTAMP_TIME, NullS); return make_datetime(format, ltime, str); } @@ -146,7 +146,7 @@ static bool make_time_with_warn(const DATE_TIME_FORMAT *format, if (warning) { make_truncated_value_warning(current_thd, str->ptr(), str->length(), - MYSQL_TIMESTAMP_TIME); + MYSQL_TIMESTAMP_TIME, NullS); make_time(format, l_time, str); } @@ -207,7 +207,8 @@ overflow: char buf[22]; int len= (int)(longlong10_to_str(seconds, buf, unsigned_flag ? 10 : -10) - buf); - make_truncated_value_warning(current_thd, buf, len, MYSQL_TIMESTAMP_TIME); + make_truncated_value_warning(current_thd, buf, len, MYSQL_TIMESTAMP_TIME, + NullS); return 1; } @@ -2960,7 +2961,8 @@ String *Item_func_maketime::val_str(String *str) char *ptr= longlong10_to_str(hour, buf, args[0]->unsigned_flag ? 10 : -10); int len = (int)(ptr - buf) + my_sprintf(ptr, (ptr, ":%02u:%02u", (uint)minute, (uint)second)); - make_truncated_value_warning(current_thd, buf, len, MYSQL_TIMESTAMP_TIME); + make_truncated_value_warning(current_thd, buf, len, MYSQL_TIMESTAMP_TIME, + NullS); } if (make_time_with_warn((DATE_TIME_FORMAT *) 0, <ime, str)) |