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
c8e5ade8
Commit
c8e5ade8
authored
May 05, 2006
by
jani@ua141d10.elisa.omakaista.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
parents
041669a4
587a6c6c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
60 additions
and
1 deletion
+60
-1
mysql-test/r/date_formats.result
mysql-test/r/date_formats.result
+36
-0
mysql-test/t/date_formats.test
mysql-test/t/date_formats.test
+22
-0
sql/item_timefunc.cc
sql/item_timefunc.cc
+2
-1
No files found.
mysql-test/r/date_formats.result
View file @
c8e5ade8
...
...
@@ -512,3 +512,39 @@ NULL
select str_to_date( 1, IF(1=1,NULL,NULL) );
str_to_date( 1, IF(1=1,NULL,NULL) )
NULL
SELECT TIME_FORMAT("24:00:00", '%r');
TIME_FORMAT("24:00:00", '%r')
12:00:00 AM
SELECT TIME_FORMAT("00:00:00", '%r');
TIME_FORMAT("00:00:00", '%r')
12:00:00 AM
SELECT TIME_FORMAT("12:00:00", '%r');
TIME_FORMAT("12:00:00", '%r')
12:00:00 PM
SELECT TIME_FORMAT("15:00:00", '%r');
TIME_FORMAT("15:00:00", '%r')
03:00:00 PM
SELECT TIME_FORMAT("01:00:00", '%r');
TIME_FORMAT("01:00:00", '%r')
01:00:00 AM
SELECT TIME_FORMAT("25:00:00", '%r');
TIME_FORMAT("25:00:00", '%r')
01:00:00 AM
SELECT TIME_FORMAT("00:00:00", '%l %p');
TIME_FORMAT("00:00:00", '%l %p')
12 AM
SELECT TIME_FORMAT("01:00:00", '%l %p');
TIME_FORMAT("01:00:00", '%l %p')
1 AM
SELECT TIME_FORMAT("12:00:00", '%l %p');
TIME_FORMAT("12:00:00", '%l %p')
12 PM
SELECT TIME_FORMAT("23:00:00", '%l %p');
TIME_FORMAT("23:00:00", '%l %p')
11 PM
SELECT TIME_FORMAT("24:00:00", '%l %p');
TIME_FORMAT("24:00:00", '%l %p')
12 AM
SELECT TIME_FORMAT("25:00:00", '%l %p');
TIME_FORMAT("25:00:00", '%l %p')
1 AM
mysql-test/t/date_formats.test
View file @
c8e5ade8
...
...
@@ -277,3 +277,25 @@ select str_to_date( 1, NULL );
select
str_to_date
(
NULL
,
1
);
select
str_to_date
(
1
,
IF
(
1
=
1
,
NULL
,
NULL
)
);
# End of 4.1 tests
#
# Bug#11326
#
SELECT
TIME_FORMAT
(
"24:00:00"
,
'%r'
);
SELECT
TIME_FORMAT
(
"00:00:00"
,
'%r'
);
SELECT
TIME_FORMAT
(
"12:00:00"
,
'%r'
);
SELECT
TIME_FORMAT
(
"15:00:00"
,
'%r'
);
SELECT
TIME_FORMAT
(
"01:00:00"
,
'%r'
);
SELECT
TIME_FORMAT
(
"25:00:00"
,
'%r'
);
#
# Bug#11324
#
SELECT
TIME_FORMAT
(
"00:00:00"
,
'%l %p'
);
SELECT
TIME_FORMAT
(
"01:00:00"
,
'%l %p'
);
SELECT
TIME_FORMAT
(
"12:00:00"
,
'%l %p'
);
SELECT
TIME_FORMAT
(
"23:00:00"
,
'%l %p'
);
SELECT
TIME_FORMAT
(
"24:00:00"
,
'%l %p'
);
SELECT
TIME_FORMAT
(
"25:00:00"
,
'%l %p'
);
sql/item_timefunc.cc
View file @
c8e5ade8
...
...
@@ -631,7 +631,8 @@ bool make_date_time(DATE_TIME_FORMAT *format, TIME *l_time,
case
'r'
:
length
=
my_sprintf
(
intbuff
,
(
intbuff
,
(
l_time
->
hour
<
12
)
?
"%02d:%02d:%02d AM"
:
"%02d:%02d:%02d PM"
,
((
l_time
->
hour
%
24
)
<
12
)
?
"%02d:%02d:%02d AM"
:
"%02d:%02d:%02d PM"
,
(
l_time
->
hour
+
11
)
%
12
+
1
,
l_time
->
minute
,
l_time
->
second
));
...
...
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