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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
75e6a71b
Commit
75e6a71b
authored
Dec 01, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/32180/50-32180
parents
07be2ef5
8309c197
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
1 deletion
+30
-1
mysql-test/r/func_time.result
mysql-test/r/func_time.result
+12
-0
mysql-test/t/func_time.test
mysql-test/t/func_time.test
+10
-0
sql-common/my_time.c
sql-common/my_time.c
+8
-1
No files found.
mysql-test/r/func_time.result
View file @
75e6a71b
...
@@ -1270,4 +1270,16 @@ select concat(a,ifnull(min(date_format(now(), '%Y-%m-%d')),' ull')) from t1;
...
@@ -1270,4 +1270,16 @@ select concat(a,ifnull(min(date_format(now(), '%Y-%m-%d')),' ull')) from t1;
ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (latin1_swedish_ci,COERCIBLE) for operation 'concat'
ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (latin1_swedish_ci,COERCIBLE) for operation 'concat'
set lc_time_names=en_US;
set lc_time_names=en_US;
drop table t1;
drop table t1;
select DATE_ADD('20071108181000', INTERVAL 1 DAY);
DATE_ADD('20071108181000', INTERVAL 1 DAY)
2007-11-09 18:10:00
select DATE_ADD(20071108181000, INTERVAL 1 DAY);
DATE_ADD(20071108181000, INTERVAL 1 DAY)
2007-11-09 18:10:00
select DATE_ADD('20071108', INTERVAL 1 DAY);
DATE_ADD('20071108', INTERVAL 1 DAY)
2007-11-09
select DATE_ADD(20071108, INTERVAL 1 DAY);
DATE_ADD(20071108, INTERVAL 1 DAY)
2007-11-09
End of 5.0 tests
End of 5.0 tests
mysql-test/t/func_time.test
View file @
75e6a71b
...
@@ -787,4 +787,14 @@ select concat(a,ifnull(min(date_format(now(), '%Y-%m-%d')),' ull')) from t1;
...
@@ -787,4 +787,14 @@ select concat(a,ifnull(min(date_format(now(), '%Y-%m-%d')),' ull')) from t1;
set
lc_time_names
=
en_US
;
set
lc_time_names
=
en_US
;
drop
table
t1
;
drop
table
t1
;
#
# Bug#32180: DATE_ADD treats datetime numeric argument as DATE
# instead of DATETIME
#
select
DATE_ADD
(
'20071108181000'
,
INTERVAL
1
DAY
);
select
DATE_ADD
(
20071108181000
,
INTERVAL
1
DAY
);
select
DATE_ADD
(
'20071108'
,
INTERVAL
1
DAY
);
select
DATE_ADD
(
20071108
,
INTERVAL
1
DAY
);
--
echo
End
of
5.0
tests
--
echo
End
of
5.0
tests
sql-common/my_time.c
View file @
75e6a71b
...
@@ -1108,9 +1108,14 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
...
@@ -1108,9 +1108,14 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
long
part1
,
part2
;
long
part1
,
part2
;
*
was_cut
=
0
;
*
was_cut
=
0
;
bzero
((
char
*
)
time_res
,
sizeof
(
*
time_res
));
time_res
->
time_type
=
MYSQL_TIMESTAMP_DATE
;
if
(
nr
==
LL
(
0
)
||
nr
>=
LL
(
10000101000000
))
if
(
nr
==
LL
(
0
)
||
nr
>=
LL
(
10000101000000
))
{
time_res
->
time_type
=
MYSQL_TIMESTAMP_DATETIME
;
goto
ok
;
goto
ok
;
}
if
(
nr
<
101
)
if
(
nr
<
101
)
goto
err
;
goto
err
;
if
(
nr
<=
(
YY_PART_YEAR
-
1
)
*
10000L
+
1231L
)
if
(
nr
<=
(
YY_PART_YEAR
-
1
)
*
10000L
+
1231L
)
...
@@ -1134,6 +1139,9 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
...
@@ -1134,6 +1139,9 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
}
}
if
(
nr
<
101000000L
)
if
(
nr
<
101000000L
)
goto
err
;
goto
err
;
time_res
->
time_type
=
MYSQL_TIMESTAMP_DATETIME
;
if
(
nr
<=
(
YY_PART_YEAR
-
1
)
*
LL
(
10000000000
)
+
LL
(
1231235959
))
if
(
nr
<=
(
YY_PART_YEAR
-
1
)
*
LL
(
10000000000
)
+
LL
(
1231235959
))
{
{
nr
=
nr
+
LL
(
20000000000000
);
/* YYMMDDHHMMSS, 2000-2069 */
nr
=
nr
+
LL
(
20000000000000
);
/* YYMMDDHHMMSS, 2000-2069 */
...
@@ -1147,7 +1155,6 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
...
@@ -1147,7 +1155,6 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
ok:
ok:
part1
=
(
long
)
(
nr
/
LL
(
1000000
));
part1
=
(
long
)
(
nr
/
LL
(
1000000
));
part2
=
(
long
)
(
nr
-
(
longlong
)
part1
*
LL
(
1000000
));
part2
=
(
long
)
(
nr
-
(
longlong
)
part1
*
LL
(
1000000
));
bzero
((
char
*
)
time_res
,
sizeof
(
*
time_res
));
time_res
->
year
=
(
int
)
(
part1
/
10000L
);
part1
%=
10000L
;
time_res
->
year
=
(
int
)
(
part1
/
10000L
);
part1
%=
10000L
;
time_res
->
month
=
(
int
)
part1
/
100
;
time_res
->
month
=
(
int
)
part1
/
100
;
time_res
->
day
=
(
int
)
part1
%
100
;
time_res
->
day
=
(
int
)
part1
%
100
;
...
...
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