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
80465ab6
Commit
80465ab6
authored
Jul 26, 2006
by
tsmith/tim@siva.hindu.god
Browse files
Options
Browse Files
Download
Plain Diff
Merge siva.hindu.god:/usr/home/tim/m/bk/global-41
into siva.hindu.god:/usr/home/tim/m/bk/global-50
parents
a9a345d9
694d4999
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletion
+18
-1
mysql-test/r/func_time.result
mysql-test/r/func_time.result
+7
-0
mysql-test/t/func_time.test
mysql-test/t/func_time.test
+10
-0
sql/field.cc
sql/field.cc
+1
-1
No files found.
mysql-test/r/func_time.result
View file @
80465ab6
...
@@ -758,6 +758,13 @@ select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')),
...
@@ -758,6 +758,13 @@ 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(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'))
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
NULL NULL January NULL
set time_zone='-6:00';
create table t1(a timestamp);
insert into t1 values (19691231190001);
select * from t1;
a
1969-12-31 19:00:01
drop table t1;
create table t1(f1 date, f2 time, f3 datetime);
create table t1(f1 date, f2 time, f3 datetime);
insert into t1 values ("2006-01-01", "12:01:01", "2006-01-01 12:01:01");
insert into t1 values ("2006-01-01", "12:01:01", "2006-01-01 12:01:01");
insert into t1 values ("2006-01-02", "12:01:02", "2006-01-02 12:01:02");
insert into t1 values ("2006-01-02", "12:01:02", "2006-01-02 12:01:02");
...
...
mysql-test/t/func_time.test
View file @
80465ab6
...
@@ -375,6 +375,16 @@ select last_day('2005-01-00');
...
@@ -375,6 +375,16 @@ select last_day('2005-01-00');
select
monthname
(
str_to_date
(
null
,
'%m'
)),
monthname
(
str_to_date
(
null
,
'%m'
)),
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
(
1
,
'%m'
)),
monthname
(
str_to_date
(
0
,
'%m'
));
#
# Bug #16327: problem with timestamp < 1970
#
set
time_zone
=
'-6:00'
;
create
table
t1
(
a
timestamp
);
insert
into
t1
values
(
19691231190001
);
select
*
from
t1
;
drop
table
t1
;
#
#
# Bug#16377 result of DATE/TIME functions were compared as strings which
# Bug#16377 result of DATE/TIME functions were compared as strings which
# can lead to a wrong result.
# can lead to a wrong result.
...
...
sql/field.cc
View file @
80465ab6
...
@@ -4606,7 +4606,7 @@ String *Field_timestamp::val_str(String *val_buffer, String *val_ptr)
...
@@ -4606,7 +4606,7 @@ String *Field_timestamp::val_str(String *val_buffer, String *val_ptr)
thd
->
time_zone_used
=
1
;
thd
->
time_zone_used
=
1
;
temp
=
time_tmp
.
year
%
100
;
temp
=
time_tmp
.
year
%
100
;
if
(
temp
<
YY_PART_YEAR
)
if
(
temp
<
YY_PART_YEAR
-
1
)
{
{
*
to
++=
'2'
;
*
to
++=
'2'
;
*
to
++=
'0'
;
*
to
++=
'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