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
8e2a56ea
Commit
8e2a56ea
authored
Oct 09, 2007
by
mhansson@dl145s.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0-opt
into dl145s.mysql.com:/data0/mhansson/bug31160/my50-bug31160
parents
ddc67f08
c7ff5062
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
2 deletions
+24
-2
mysql-test/r/func_sapdb.result
mysql-test/r/func_sapdb.result
+1
-1
mysql-test/r/func_time.result
mysql-test/r/func_time.result
+9
-0
mysql-test/t/func_time.test
mysql-test/t/func_time.test
+10
-0
sql/item_timefunc.h
sql/item_timefunc.h
+4
-1
No files found.
mysql-test/r/func_sapdb.result
View file @
8e2a56ea
...
@@ -196,7 +196,7 @@ f2 datetime YES NULL
...
@@ -196,7 +196,7 @@ f2 datetime YES NULL
f3 time YES NULL
f3 time YES NULL
f4 time YES NULL
f4 time YES NULL
f5 time YES NULL
f5 time YES NULL
f6 time
NO 00:00:00
f6 time
YES NULL
f7 datetime YES NULL
f7 datetime YES NULL
f8 date YES NULL
f8 date YES NULL
f9 time YES NULL
f9 time YES NULL
...
...
mysql-test/r/func_time.result
View file @
8e2a56ea
...
@@ -1027,6 +1027,15 @@ fmtddate field2
...
@@ -1027,6 +1027,15 @@ fmtddate field2
Sep-4 12:00AM abcd
Sep-4 12:00AM abcd
DROP TABLE testBug8868;
DROP TABLE testBug8868;
SET NAMES DEFAULT;
SET NAMES DEFAULT;
CREATE TABLE t1 (
a TIMESTAMP
);
INSERT INTO t1 VALUES (now()), (now());
SELECT 1 FROM t1 ORDER BY MAKETIME(1, 1, a);
1
1
1
DROP TABLE t1;
(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H)
(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H)
union
union
(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H);
(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H);
...
...
mysql-test/t/func_time.test
View file @
8e2a56ea
...
@@ -545,6 +545,16 @@ DROP TABLE testBug8868;
...
@@ -545,6 +545,16 @@ DROP TABLE testBug8868;
SET
NAMES
DEFAULT
;
SET
NAMES
DEFAULT
;
#
# Bug #31160: MAKETIME() crashes server when returning NULL in ORDER BY using
# filesort
#
CREATE
TABLE
t1
(
a
TIMESTAMP
);
INSERT
INTO
t1
VALUES
(
now
()),
(
now
());
SELECT
1
FROM
t1
ORDER
BY
MAKETIME
(
1
,
1
,
a
);
DROP
TABLE
t1
;
#
#
# Bug #19844 time_format in Union truncates values
# Bug #19844 time_format in Union truncates values
...
...
sql/item_timefunc.h
View file @
8e2a56ea
...
@@ -962,7 +962,10 @@ class Item_func_maketime :public Item_str_timefunc
...
@@ -962,7 +962,10 @@ class Item_func_maketime :public Item_str_timefunc
{
{
public:
public:
Item_func_maketime
(
Item
*
a
,
Item
*
b
,
Item
*
c
)
Item_func_maketime
(
Item
*
a
,
Item
*
b
,
Item
*
c
)
:
Item_str_timefunc
(
a
,
b
,
c
)
{}
:
Item_str_timefunc
(
a
,
b
,
c
)
{
maybe_null
=
TRUE
;
}
String
*
val_str
(
String
*
str
);
String
*
val_str
(
String
*
str
);
const
char
*
func_name
()
const
{
return
"maketime"
;
}
const
char
*
func_name
()
const
{
return
"maketime"
;
}
};
};
...
...
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