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
b9eb6361
Commit
b9eb6361
authored
2 years ago
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.5 into 10.6
parents
1d362987
8494758e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
3 deletions
+43
-3
mysql-test/main/insert_innodb.result
mysql-test/main/insert_innodb.result
+12
-0
mysql-test/main/insert_innodb.test
mysql-test/main/insert_innodb.test
+17
-0
plugin/type_mysql_json/type.cc
plugin/type_mysql_json/type.cc
+1
-1
sql/temporary_tables.cc
sql/temporary_tables.cc
+4
-0
storage/innobase/os/os0file.cc
storage/innobase/os/os0file.cc
+9
-2
No files found.
mysql-test/main/insert_innodb.result
View file @
b9eb6361
...
...
@@ -43,3 +43,15 @@ INSERT IGNORE INTO t2 VALUES('abc', 2) ON DUPLICATE KEY UPDATE fld1= 'def';
Warnings:
Warning 1452 Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `fk` FOREIGN KEY (`fld2`) REFERENCES `t1` (`fld1`))
DROP TABLE t2, t1;
#
# MDEV-26433: assertion: table->get_ref_count() == 0 in dict0dict.cc
# line 1915
#
CREATE TEMPORARY TABLE v0 ( v1 TEXT ( 15 ) CHAR SET BINARY NOT NULL NOT NULL UNIQUE CHECK ( v1 ) ) REPLACE SELECT NULL AS v3 , 74 AS v2 ;
ERROR HY000: Field 'v1' doesn't have a default value
CREATE TEMPORARY TABLE t1 (i TEXT(15) NOT NULL DEFAULT '' UNIQUE CHECK (i)) engine=innodb
REPLACE SELECT NULL AS a;
ERROR HY000: Field 'DB_ROW_HASH_1' doesn't have a default value
#
# End of 10.5 tests
#
This diff is collapsed.
Click to expand it.
mysql-test/main/insert_innodb.test
View file @
b9eb6361
...
...
@@ -62,3 +62,20 @@ INSERT IGNORE INTO t2 VALUES('abc', 2) ON DUPLICATE KEY UPDATE fld1= 'def';
--
disable_warnings
DROP
TABLE
t2
,
t1
;
--
echo
#
--
echo
# MDEV-26433: assertion: table->get_ref_count() == 0 in dict0dict.cc
--
echo
# line 1915
--
echo
#
--
error
ER_NO_DEFAULT_FOR_FIELD
CREATE
TEMPORARY
TABLE
v0
(
v1
TEXT
(
15
)
CHAR
SET
BINARY
NOT
NULL
NOT
NULL
UNIQUE
CHECK
(
v1
)
)
REPLACE
SELECT
NULL
AS
v3
,
74
AS
v2
;
--
error
ER_NO_DEFAULT_FOR_FIELD
CREATE
TEMPORARY
TABLE
t1
(
i
TEXT
(
15
)
NOT
NULL
DEFAULT
''
UNIQUE
CHECK
(
i
))
engine
=
innodb
REPLACE
SELECT
NULL
AS
a
;
--
echo
#
--
echo
# End of 10.5 tests
--
echo
#
This diff is collapsed.
Click to expand it.
plugin/type_mysql_json/type.cc
View file @
b9eb6361
...
...
@@ -211,6 +211,6 @@ maria_declare_plugin(type_mysql_json)
NULL
,
NULL
,
"0.1"
,
MariaDB_PLUGIN_MATURITY_
GAMMA
MariaDB_PLUGIN_MATURITY_
STABLE
}
maria_declare_plugin_end
;
This diff is collapsed.
Click to expand it.
sql/temporary_tables.cc
View file @
b9eb6361
...
...
@@ -625,6 +625,10 @@ bool THD::drop_temporary_table(TABLE *table, bool *is_trans, bool delete_table)
DBUG_PRINT
(
"tmptable"
,
(
"Dropping table: '%s'.'%s'"
,
table
->
s
->
db
.
str
,
table
->
s
->
table_name
.
str
));
// close all handlers in case it is statement abort and some can be left
if
(
is_error
())
table
->
file
->
ha_reset
();
locked
=
lock_temporary_tables
();
share
=
tmp_table_share
(
table
);
...
...
This diff is collapsed.
Click to expand it.
storage/innobase/os/os0file.cc
View file @
b9eb6361
...
...
@@ -3521,10 +3521,17 @@ extern void fil_aio_callback(const IORequest &request);
static
void
io_callback
(
tpool
::
aiocb
*
cb
)
{
ut_a
(
cb
->
m_err
==
DB_SUCCESS
);
const
IORequest
&
request
=
*
static_cast
<
const
IORequest
*>
(
static_cast
<
const
void
*>
(
cb
->
m_userdata
));
if
(
cb
->
m_err
!=
DB_SUCCESS
)
{
ib
::
fatal
()
<<
"IO Error: "
<<
cb
->
m_err
<<
" during "
<<
(
request
.
is_async
()
?
"async "
:
"sync "
)
<<
(
request
.
is_LRU
()
?
"lru "
:
""
)
<<
(
cb
->
m_opcode
==
tpool
::
aio_opcode
::
AIO_PREAD
?
"read"
:
"write"
)
<<
" of "
<<
cb
->
m_len
<<
" bytes, for file "
<<
cb
->
m_fh
<<
", returned "
<<
cb
->
m_ret_len
;
}
/* Return cb back to cache*/
if
(
cb
->
m_opcode
==
tpool
::
aio_opcode
::
AIO_PREAD
)
{
...
...
This diff is collapsed.
Click to expand it.
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