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
f244b499
Commit
f244b499
authored
Oct 14, 2020
by
Nikita Malyavin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
handler: move row change start signal down after the checks
parent
e618f7e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
sql/handler.cc
sql/handler.cc
+8
-8
No files found.
sql/handler.cc
View file @
f244b499
...
@@ -7129,16 +7129,17 @@ int handler::ha_write_row(const uchar *buf)
...
@@ -7129,16 +7129,17 @@ int handler::ha_write_row(const uchar *buf)
if
((
error
=
ha_check_overlaps
(
NULL
,
buf
)))
if
((
error
=
ha_check_overlaps
(
NULL
,
buf
)))
DBUG_RETURN
(
error
);
DBUG_RETURN
(
error
);
MYSQL_INSERT_ROW_START
(
table_share
->
db
.
str
,
table_share
->
table_name
.
str
);
mark_trx_read_write
();
increment_statistics
(
&
SSV
::
ha_write_count
);
if
(
table
->
s
->
long_unique_table
&&
this
==
table
->
file
)
if
(
table
->
s
->
long_unique_table
&&
this
==
table
->
file
)
{
{
DBUG_ASSERT
(
inited
==
NONE
||
lookup_handler
!=
this
);
DBUG_ASSERT
(
inited
==
NONE
||
lookup_handler
!=
this
);
if
((
error
=
check_duplicate_long_entries
(
buf
)))
if
((
error
=
check_duplicate_long_entries
(
buf
)))
DBUG_RETURN
(
error
);
DBUG_RETURN
(
error
);
}
}
MYSQL_INSERT_ROW_START
(
table_share
->
db
.
str
,
table_share
->
table_name
.
str
);
mark_trx_read_write
();
increment_statistics
(
&
SSV
::
ha_write_count
);
TABLE_IO_WAIT
(
tracker
,
PSI_TABLE_WRITE_ROW
,
MAX_KEY
,
error
,
TABLE_IO_WAIT
(
tracker
,
PSI_TABLE_WRITE_ROW
,
MAX_KEY
,
error
,
{
error
=
write_row
(
buf
);
})
{
error
=
write_row
(
buf
);
})
...
@@ -7181,10 +7182,6 @@ int handler::ha_update_row(const uchar *old_data, const uchar *new_data)
...
@@ -7181,10 +7182,6 @@ int handler::ha_update_row(const uchar *old_data, const uchar *new_data)
uint
saved_status
=
table
->
status
;
uint
saved_status
=
table
->
status
;
error
=
ha_check_overlaps
(
old_data
,
new_data
);
error
=
ha_check_overlaps
(
old_data
,
new_data
);
MYSQL_UPDATE_ROW_START
(
table_share
->
db
.
str
,
table_share
->
table_name
.
str
);
mark_trx_read_write
();
increment_statistics
(
&
SSV
::
ha_update_count
);
if
(
!
error
&&
table
->
s
->
long_unique_table
&&
this
==
table
->
file
)
if
(
!
error
&&
table
->
s
->
long_unique_table
&&
this
==
table
->
file
)
error
=
check_duplicate_long_entries_update
(
new_data
);
error
=
check_duplicate_long_entries_update
(
new_data
);
table
->
status
=
saved_status
;
table
->
status
=
saved_status
;
...
@@ -7192,6 +7189,9 @@ int handler::ha_update_row(const uchar *old_data, const uchar *new_data)
...
@@ -7192,6 +7189,9 @@ int handler::ha_update_row(const uchar *old_data, const uchar *new_data)
if
(
error
)
if
(
error
)
return
error
;
return
error
;
MYSQL_UPDATE_ROW_START
(
table_share
->
db
.
str
,
table_share
->
table_name
.
str
);
mark_trx_read_write
();
increment_statistics
(
&
SSV
::
ha_update_count
);
TABLE_IO_WAIT
(
tracker
,
PSI_TABLE_UPDATE_ROW
,
active_index
,
0
,
TABLE_IO_WAIT
(
tracker
,
PSI_TABLE_UPDATE_ROW
,
active_index
,
0
,
{
error
=
update_row
(
old_data
,
new_data
);})
{
error
=
update_row
(
old_data
,
new_data
);})
...
...
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