Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
8db63fd5
Commit
8db63fd5
authored
May 10, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
parents
b02a34f2
a8693be9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
2 deletions
+35
-2
mysql-test/r/func_time.result
mysql-test/r/func_time.result
+19
-0
mysql-test/t/func_time.test
mysql-test/t/func_time.test
+14
-0
sql/item_timefunc.cc
sql/item_timefunc.cc
+2
-2
No files found.
mysql-test/r/func_time.result
View file @
8db63fd5
...
...
@@ -732,6 +732,25 @@ SELECT count(*) FROM t1 WHERE d>FROM_DAYS(TO_DAYS(@TMP)) AND d<=FROM_DAYS(TO_DAY
count(*)
3
DROP TABLE t1;
select last_day('2005-00-00');
last_day('2005-00-00')
NULL
Warnings:
Warning 1292 Truncated incorrect datetime value: '2005-00-00'
select last_day('2005-00-01');
last_day('2005-00-01')
NULL
Warnings:
Warning 1292 Truncated incorrect datetime value: '2005-00-01'
select last_day('2005-01-00');
last_day('2005-01-00')
NULL
Warnings:
Warning 1292 Truncated incorrect datetime value: '2005-01-00'
select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')),
monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));
monthname(str_to_date(null, '%m')) monthname(str_to_date(null, '%m')) monthname(str_to_date(1, '%m')) monthname(str_to_date(0, '%m'))
NULL NULL January NULL
explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,
timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2;
id select_type table type possible_keys key key_len ref rows Extra
...
...
mysql-test/t/func_time.test
View file @
8db63fd5
...
...
@@ -352,6 +352,20 @@ INSERT INTO t1 VALUES (NOW());
SELECT
count
(
*
)
FROM
t1
WHERE
d
>
FROM_DAYS
(
TO_DAYS
(
@
TMP
))
AND
d
<=
FROM_DAYS
(
TO_DAYS
(
@
TMP
)
+
1
);
DROP
TABLE
t1
;
#
# Bug #10568
#
select
last_day
(
'2005-00-00'
);
select
last_day
(
'2005-00-01'
);
select
last_day
(
'2005-01-00'
);
#
# Bug #18501: monthname and NULLs
#
select
monthname
(
str_to_date
(
null
,
'%m'
)),
monthname
(
str_to_date
(
null
,
'%m'
)),
monthname
(
str_to_date
(
1
,
'%m'
)),
monthname
(
str_to_date
(
0
,
'%m'
));
# End of 4.1 tests
...
...
sql/item_timefunc.cc
View file @
8db63fd5
...
...
@@ -917,9 +917,9 @@ String* Item_func_monthname::val_str(String* str)
{
DBUG_ASSERT
(
fixed
==
1
);
const
char
*
month_name
;
uint
month
=
(
uint
)
Item_func_month
::
val_int
();
uint
month
=
(
uint
)
val_int
();
if
(
!
month
)
// This is also true for NULL
if
(
null_value
||
!
month
)
{
null_value
=
1
;
return
(
String
*
)
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment