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
8152c52e
Commit
8152c52e
authored
Mar 15, 2018
by
Vicențiu Ciorbaru
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch '10.0' into 10.1
parents
782fb1e0
3d5dff6c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
75 additions
and
3 deletions
+75
-3
debian/control
debian/control
+2
-2
mysql-test/r/func_time.result
mysql-test/r/func_time.result
+24
-0
mysql-test/r/subselect_mat.result
mysql-test/r/subselect_mat.result
+15
-0
mysql-test/t/func_time.test
mysql-test/t/func_time.test
+16
-0
mysql-test/t/subselect_mat.test
mysql-test/t/subselect_mat.test
+13
-0
sql/opt_subselect.cc
sql/opt_subselect.cc
+3
-1
sql/sql_time.cc
sql/sql_time.cc
+2
-0
No files found.
debian/control
View file @
8152c52e
...
@@ -27,8 +27,8 @@ Build-Depends: bison,
...
@@ -27,8 +27,8 @@ Build-Depends: bison,
libjemalloc
-
dev
(>=
3.0.0
~)
[
linux
-
any
]
libjemalloc
-
dev
(>=
3.0.0
~)
[
linux
-
any
]
Standards
-
Version
:
3.8.2
Standards
-
Version
:
3.8.2
Homepage
:
http
://
mariadb
.
org
/
Homepage
:
http
://
mariadb
.
org
/
Vcs
-
Git
:
https
://
github
.
com
/
MariaDB
/
server
.
git
Vcs
-
Browser
:
https
://
github
.
com
/
MariaDB
/
server
/
Vcs
-
Browser
:
https
://
github
.
com
/
MariaDB
/
server
/
Vcs
-
Git
:
https
://
github
.
com
/
MariaDB
/
server
.
git
Package
:
libmariadbclient18
Package
:
libmariadbclient18
Architecture
:
any
Architecture
:
any
...
@@ -450,4 +450,4 @@ Package: mariadb-backup-10.1
...
@@ -450,4 +450,4 @@ Package: mariadb-backup-10.1
Section
:
database
Section
:
database
Architecture
:
any
Architecture
:
any
Depends
:
libarchive12
|
libarchive13
Depends
:
libarchive12
|
libarchive13
Description
:
Backup
tool
for
MariaDB
server
Description
:
Backup
tool
for
MariaDB
server
\ No newline at end of file
mysql-test/r/func_time.result
View file @
8152c52e
...
@@ -2904,6 +2904,30 @@ NULL
...
@@ -2904,6 +2904,30 @@ NULL
Warnings:
Warnings:
Warning 1441 Datetime function: datetime field overflow
Warning 1441 Datetime function: datetime field overflow
#
#
# MDEV-13202 Assertion `ltime->neg == 0' failed in date_to_datetime
#
CREATE TABLE t1 (i INT, d DATE);
INSERT INTO t1 VALUES (1, '1970-01-01');
SELECT MAX(NULLIF(i,1)) FROM t1 ORDER BY DATE_SUB(d,INTERVAL 17300000 HOUR);
MAX(NULLIF(i,1))
NULL
Warnings:
Warning 1441 Datetime function: datetime field overflow
DROP TABLE t1;
CREATE TABLE t1 (i INT, d DATE);
INSERT INTO t1 VALUES (1, '1970-01-01');
SELECT CONCAT(DATE_SUB(d, INTERVAL 17300000 HOUR)) FROM t1;
CONCAT(DATE_SUB(d, INTERVAL 17300000 HOUR))
NULL
Warnings:
Warning 1441 Datetime function: datetime field overflow
DROP TABLE t1;
SELECT CONCAT(DATE_SUB(TIMESTAMP'1970-01-01 00:00:00', INTERVAL 17300000 HOUR));
CONCAT(DATE_SUB(TIMESTAMP'1970-01-01 00:00:00', INTERVAL 17300000 HOUR))
NULL
Warnings:
Warning 1441 Datetime function: datetime field overflow
#
# End of 10.0 tests
# End of 10.0 tests
#
#
#
#
...
...
mysql-test/r/subselect_mat.result
View file @
8152c52e
...
@@ -2757,6 +2757,21 @@ a b sq
...
@@ -2757,6 +2757,21 @@ a b sq
4 2 1
4 2 1
drop table t1, t2;
drop table t1, t2;
#
#
# MDEV-15235: Assertion `length > 0' failed in create_ref_for_key
#
CREATE TABLE t1 (i INT);
INSERT INTO t1 VALUES (1),(2);
CREATE TABLE t2 (f CHAR(1));
INSERT INTO t2 VALUES ('a'),('b');
explain
SELECT * FROM t2 WHERE f IN ( SELECT LEFT('foo',0) FROM t1 ORDER BY 1 );
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t2 ALL NULL NULL NULL NULL 2 Using where
2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2
SELECT * FROM t2 WHERE f IN ( SELECT LEFT('foo',0) FROM t1 ORDER BY 1 );
f
DROP TABLE t1, t2;
#
# MDEV-9489: Assertion `0' failed in Protocol::end_statement() on
# MDEV-9489: Assertion `0' failed in Protocol::end_statement() on
# UNION ALL
# UNION ALL
#
#
...
...
mysql-test/t/func_time.test
View file @
8152c52e
...
@@ -1762,6 +1762,22 @@ SELECT ADDDATE(DATE'0000-01-01', INTERVAL '3652423:0:0:315569433559' DAY_SECOND)
...
@@ -1762,6 +1762,22 @@ SELECT ADDDATE(DATE'0000-01-01', INTERVAL '3652423:0:0:315569433559' DAY_SECOND)
SELECT
ADDDATE
(
DATE
'0000-01-01'
,
INTERVAL
'0:87658175:0:315569433559'
DAY_SECOND
);
SELECT
ADDDATE
(
DATE
'0000-01-01'
,
INTERVAL
'0:87658175:0:315569433559'
DAY_SECOND
);
SELECT
ADDDATE
(
DATE
'0000-01-01'
,
INTERVAL
'0:0:5259490559:315569433599'
DAY_SECOND
);
SELECT
ADDDATE
(
DATE
'0000-01-01'
,
INTERVAL
'0:0:5259490559:315569433599'
DAY_SECOND
);
--
echo
#
--
echo
# MDEV-13202 Assertion `ltime->neg == 0' failed in date_to_datetime
--
echo
#
CREATE
TABLE
t1
(
i
INT
,
d
DATE
);
INSERT
INTO
t1
VALUES
(
1
,
'1970-01-01'
);
SELECT
MAX
(
NULLIF
(
i
,
1
))
FROM
t1
ORDER
BY
DATE_SUB
(
d
,
INTERVAL
17300000
HOUR
);
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
i
INT
,
d
DATE
);
INSERT
INTO
t1
VALUES
(
1
,
'1970-01-01'
);
SELECT
CONCAT
(
DATE_SUB
(
d
,
INTERVAL
17300000
HOUR
))
FROM
t1
;
DROP
TABLE
t1
;
SELECT
CONCAT
(
DATE_SUB
(
TIMESTAMP
'1970-01-01 00:00:00'
,
INTERVAL
17300000
HOUR
));
--
echo
#
--
echo
#
--
echo
# End of 10.0 tests
--
echo
# End of 10.0 tests
...
...
mysql-test/t/subselect_mat.test
View file @
8152c52e
...
@@ -255,6 +255,19 @@ FROM t1;
...
@@ -255,6 +255,19 @@ FROM t1;
drop
table
t1
,
t2
;
drop
table
t1
,
t2
;
--
echo
#
--
echo
# MDEV-15235: Assertion `length > 0' failed in create_ref_for_key
--
echo
#
CREATE
TABLE
t1
(
i
INT
);
INSERT
INTO
t1
VALUES
(
1
),(
2
);
CREATE
TABLE
t2
(
f
CHAR
(
1
));
INSERT
INTO
t2
VALUES
(
'a'
),(
'b'
);
explain
SELECT
*
FROM
t2
WHERE
f
IN
(
SELECT
LEFT
(
'foo'
,
0
)
FROM
t1
ORDER
BY
1
);
SELECT
*
FROM
t2
WHERE
f
IN
(
SELECT
LEFT
(
'foo'
,
0
)
FROM
t1
ORDER
BY
1
);
DROP
TABLE
t1
,
t2
;
--
echo
#
--
echo
#
--
echo
# MDEV-9489: Assertion `0' failed in Protocol::end_statement() on
--
echo
# MDEV-9489: Assertion `0' failed in Protocol::end_statement() on
--
echo
# UNION ALL
--
echo
# UNION ALL
...
...
sql/opt_subselect.cc
View file @
8152c52e
...
@@ -875,8 +875,10 @@ bool subquery_types_allow_materialization(Item_in_subselect *in_subs)
...
@@ -875,8 +875,10 @@ bool subquery_types_allow_materialization(Item_in_subselect *in_subs)
Make sure that create_tmp_table will not fail due to too long keys.
Make sure that create_tmp_table will not fail due to too long keys.
See MDEV-7122. This check is performed inside create_tmp_table also and
See MDEV-7122. This check is performed inside create_tmp_table also and
we must do it so that we know the table has keys created.
we must do it so that we know the table has keys created.
Make sure that the length of the key for the temp_table is atleast
greater than 0.
*/
*/
if
(
total_key_length
>
tmp_table_max_key_length
()
||
if
(
!
total_key_length
||
total_key_length
>
tmp_table_max_key_length
()
||
elements
>
tmp_table_max_key_parts
())
elements
>
tmp_table_max_key_parts
())
DBUG_RETURN
(
FALSE
);
DBUG_RETURN
(
FALSE
);
...
...
sql/sql_time.cc
View file @
8152c52e
...
@@ -959,6 +959,8 @@ bool date_add_interval(MYSQL_TIME *ltime, interval_type int_type,
...
@@ -959,6 +959,8 @@ bool date_add_interval(MYSQL_TIME *ltime, interval_type int_type,
ltime
->
day
=
0
;
ltime
->
day
=
0
;
return
0
;
return
0
;
}
}
else
if
(
ltime
->
neg
)
goto
invalid_date
;
if
(
int_type
!=
INTERVAL_DAY
)
if
(
int_type
!=
INTERVAL_DAY
)
ltime
->
time_type
=
MYSQL_TIMESTAMP_DATETIME
;
// Return full date
ltime
->
time_type
=
MYSQL_TIMESTAMP_DATETIME
;
// Return full date
...
...
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