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
a0c86794
Commit
a0c86794
authored
Oct 07, 2013
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added correct mutexing on trx handling.
parent
f222e7d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
12 deletions
+22
-12
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+22
-12
No files found.
storage/innobase/handler/ha_innodb.cc
View file @
a0c86794
...
@@ -6029,7 +6029,7 @@ wsrep_store_key_val_for_row(
...
@@ -6029,7 +6029,7 @@ wsrep_store_key_val_for_row(
char
*
buff_start
=
buff
;
char
*
buff_start
=
buff
;
enum_field_types
mysql_type
;
enum_field_types
mysql_type
;
Field
*
field
;
Field
*
field
;
DBUG_ENTER
(
"store_key_val_for_row"
);
DBUG_ENTER
(
"store_key_val_for_row"
);
bzero
(
buff
,
buff_len
);
bzero
(
buff
,
buff_len
);
...
@@ -7944,9 +7944,12 @@ ha_innobase::update_row(
...
@@ -7944,9 +7944,12 @@ ha_innobase::update_row(
if
(
!
error
&&
wsrep_thd_exec_mode
(
user_thd
)
==
LOCAL_STATE
&&
if
(
!
error
&&
wsrep_thd_exec_mode
(
user_thd
)
==
LOCAL_STATE
&&
wsrep_on
(
user_thd
))
{
wsrep_on
(
user_thd
))
{
WSREP_DEBUG
(
"WSREP: UPDATE_ROW_KEY"
);
DBUG_PRINT
(
"wsrep"
,
(
"update row key"
));
DBUG_PRINT
(
"wsrep"
,
(
"update row key"
));
if
(
wsrep_append_keys
(
user_thd
,
false
,
old_row
,
new_row
))
{
if
(
wsrep_append_keys
(
user_thd
,
false
,
old_row
,
new_row
))
{
WSREP_DEBUG
(
"WSREP: UPDATE_ROW_KEY FAILED"
);
DBUG_PRINT
(
"wsrep"
,
(
"row key failed"
));
DBUG_PRINT
(
"wsrep"
,
(
"row key failed"
));
err
=
HA_ERR_INTERNAL_ERROR
;
err
=
HA_ERR_INTERNAL_ERROR
;
goto
wsrep_error
;
goto
wsrep_error
;
...
@@ -9426,10 +9429,10 @@ ha_innobase::wsrep_append_keys(
...
@@ -9426,10 +9429,10 @@ ha_innobase::wsrep_append_keys(
trx_t
*
trx
=
thd_to_trx
(
thd
);
trx_t
*
trx
=
thd_to_trx
(
thd
);
if
(
table_share
&&
table_share
->
tmp_table
!=
NO_TMP_TABLE
)
{
if
(
table_share
&&
table_share
->
tmp_table
!=
NO_TMP_TABLE
)
{
WSREP_DEBUG
(
"skipping tmp table DML: THD: %lu tmp: %d SQL: %s"
,
WSREP_DEBUG
(
"skipping tmp table DML: THD: %lu tmp: %d SQL: %s"
,
wsrep_thd_thread_id
(
thd
),
wsrep_thd_thread_id
(
thd
),
table_share
->
tmp_table
,
table_share
->
tmp_table
,
(
wsrep_thd_query
(
thd
))
?
(
wsrep_thd_query
(
thd
))
?
wsrep_thd_query
(
thd
)
:
"void"
);
wsrep_thd_query
(
thd
)
:
"void"
);
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
}
...
@@ -9446,18 +9449,20 @@ ha_innobase::wsrep_append_keys(
...
@@ -9446,18 +9449,20 @@ ha_innobase::wsrep_append_keys(
if
(
!
is_null
)
{
if
(
!
is_null
)
{
int
rcode
=
wsrep_append_key
(
int
rcode
=
wsrep_append_key
(
thd
,
trx
,
table_share
,
table
,
keyval
,
thd
,
trx
,
table_share
,
table
,
keyval
,
len
,
shared
);
len
,
shared
);
if
(
rcode
)
DBUG_RETURN
(
rcode
);
if
(
rcode
)
DBUG_RETURN
(
rcode
);
}
}
else
else
{
{
WSREP_DEBUG
(
"NULL key skipped (proto 0): %s"
,
WSREP_DEBUG
(
"NULL key skipped (proto 0): %s"
,
wsrep_thd_query
(
thd
));
wsrep_thd_query
(
thd
));
}
}
}
else
{
}
else
{
ut_a
(
table
->
s
->
keys
<=
256
);
ut_a
(
table
->
s
->
keys
<=
256
);
uint
i
;
uint
i
;
WSREP_DEBUG
(
"WSREP: append key"
);
for
(
i
=
0
;
i
<
table
->
s
->
keys
;
++
i
)
{
for
(
i
=
0
;
i
<
table
->
s
->
keys
;
++
i
)
{
uint
len
;
uint
len
;
char
keyval0
[
WSREP_MAX_SUPPORTED_KEY_LENGTH
+
1
]
=
{
'\0'
};
char
keyval0
[
WSREP_MAX_SUPPORTED_KEY_LENGTH
+
1
]
=
{
'\0'
};
...
@@ -9476,27 +9481,27 @@ ha_innobase::wsrep_append_keys(
...
@@ -9476,27 +9481,27 @@ ha_innobase::wsrep_append_keys(
key_appended
=
true
;
key_appended
=
true
;
len
=
wsrep_store_key_val_for_row
(
len
=
wsrep_store_key_val_for_row
(
table
,
i
,
key0
,
key_info
->
key_length
,
table
,
i
,
key0
,
key_info
->
key_length
,
record0
,
&
is_null
);
record0
,
&
is_null
);
if
(
!
is_null
)
{
if
(
!
is_null
)
{
int
rcode
=
wsrep_append_key
(
int
rcode
=
wsrep_append_key
(
thd
,
trx
,
table_share
,
table
,
thd
,
trx
,
table_share
,
table
,
keyval0
,
len
+
1
,
shared
);
keyval0
,
len
+
1
,
shared
);
if
(
rcode
)
DBUG_RETURN
(
rcode
);
if
(
rcode
)
DBUG_RETURN
(
rcode
);
}
}
else
else
{
{
WSREP_DEBUG
(
"NULL key skipped: %s"
,
WSREP_DEBUG
(
"NULL key skipped: %s"
,
wsrep_thd_query
(
thd
));
wsrep_thd_query
(
thd
));
}
}
if
(
record1
)
{
if
(
record1
)
{
len
=
wsrep_store_key_val_for_row
(
len
=
wsrep_store_key_val_for_row
(
table
,
i
,
key1
,
key_info
->
key_length
,
table
,
i
,
key1
,
key_info
->
key_length
,
record1
,
&
is_null
);
record1
,
&
is_null
);
if
(
!
is_null
&&
memcmp
(
key0
,
key1
,
len
))
{
if
(
!
is_null
&&
memcmp
(
key0
,
key1
,
len
))
{
int
rcode
=
wsrep_append_key
(
int
rcode
=
wsrep_append_key
(
thd
,
trx
,
table_share
,
thd
,
trx
,
table_share
,
table
,
table
,
keyval1
,
len
+
1
,
shared
);
keyval1
,
len
+
1
,
shared
);
if
(
rcode
)
DBUG_RETURN
(
rcode
);
if
(
rcode
)
DBUG_RETURN
(
rcode
);
}
}
...
@@ -9510,6 +9515,7 @@ ha_innobase::wsrep_append_keys(
...
@@ -9510,6 +9515,7 @@ ha_innobase::wsrep_append_keys(
uchar
digest
[
16
];
uchar
digest
[
16
];
int
rcode
;
int
rcode
;
WSREP_DEBUG
(
"WSREP: append key 2"
);
wsrep_calc_row_hash
(
digest
,
record0
,
table
,
prebuilt
,
thd
);
wsrep_calc_row_hash
(
digest
,
record0
,
table
,
prebuilt
,
thd
);
if
((
rcode
=
wsrep_append_key
(
thd
,
trx
,
table_share
,
table
,
if
((
rcode
=
wsrep_append_key
(
thd
,
trx
,
table_share
,
table
,
(
const
char
*
)
digest
,
16
,
(
const
char
*
)
digest
,
16
,
...
@@ -16864,8 +16870,10 @@ wsrep_abort_transaction(handlerton* hton, THD *bf_thd, THD *victim_thd,
...
@@ -16864,8 +16870,10 @@ wsrep_abort_transaction(handlerton* hton, THD *bf_thd, THD *victim_thd,
if
(
victim_trx
)
if
(
victim_trx
)
{
{
int
rcode
=
wsrep_innobase_kill_one_trx
(
bf_trx
,
victim_trx
,
mutex_enter
(
&
trx_sys
->
mutex
);
int
rcode
=
wsrep_innobase_kill_one_trx
(
bf_trx
,
victim_trx
,
signal
);
signal
);
mutex_exit
(
&
trx_sys
->
mutex
);
wsrep_srv_conc_cancel_wait
(
victim_trx
);
wsrep_srv_conc_cancel_wait
(
victim_trx
);
DBUG_RETURN
(
rcode
);
DBUG_RETURN
(
rcode
);
}
else
{
}
else
{
...
@@ -16905,7 +16913,9 @@ wsrep_fake_trx_id(
...
@@ -16905,7 +16913,9 @@ wsrep_fake_trx_id(
handlerton
*
hton
,
handlerton
*
hton
,
THD
*
thd
)
/*!< in: user thread handle */
THD
*
thd
)
/*!< in: user thread handle */
{
{
mutex_enter
(
&
trx_sys
->
mutex
);
trx_id_t
trx_id
=
trx_sys_get_new_trx_id
();
trx_id_t
trx_id
=
trx_sys_get_new_trx_id
();
mutex_exit
(
&
trx_sys
->
mutex
);
(
void
*
)
wsrep_trx_handle_for_id
(
wsrep_thd_trx_handle
(
thd
),
trx_id
);
(
void
*
)
wsrep_trx_handle_for_id
(
wsrep_thd_trx_handle
(
thd
),
trx_id
);
}
}
...
...
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