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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
e042a3d2
Commit
e042a3d2
authored
Nov 19, 2002
by
lenz@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge lgrimmer@work.mysql.com:/home/bk/mysql
into mysql.com:/space/my/mysql-3.23
parents
b507a851
541c40b0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletion
+5
-1
innobase/include/row0mysql.h
innobase/include/row0mysql.h
+1
-0
innobase/row/row0mysql.c
innobase/row/row0mysql.c
+1
-0
sql/ha_innobase.cc
sql/ha_innobase.cc
+3
-1
No files found.
innobase/include/row0mysql.h
View file @
e042a3d2
...
...
@@ -393,6 +393,7 @@ struct row_prebuilt_struct {
an SQL statement: we may have to set
an intention lock on the table,
create a consistent read view etc. */
ibool
mysql_has_locked
;
ibool
clust_index_was_generated
;
/* if the user did not define a
primary key in MySQL, then Innobase
...
...
innobase/row/row0mysql.c
View file @
e042a3d2
...
...
@@ -320,6 +320,7 @@ row_create_prebuilt(
prebuilt
->
trx
=
NULL
;
prebuilt
->
sql_stat_start
=
TRUE
;
prebuilt
->
mysql_has_locked
=
FALSE
;
prebuilt
->
index
=
NULL
;
prebuilt
->
n_template
=
0
;
...
...
sql/ha_innobase.cc
View file @
e042a3d2
...
...
@@ -3453,7 +3453,7 @@ ha_innobase::start_stmt(
prebuilt
->
hint_no_need_to_fetch_extra_cols
=
TRUE
;
prebuilt
->
read_just_key
=
0
;
if
(
prebuilt
->
select_lock_type
==
LOCK_NONE
)
{
if
(
!
prebuilt
->
mysql_has_locked
)
{
/* This handle is for a temporary table created inside
this same LOCK TABLES; since MySQL does NOT call external_lock
in this case, we must use x-row locks inside InnoDB to be
...
...
@@ -3510,6 +3510,7 @@ ha_innobase::external_lock(
thd
->
transaction
.
all
.
innodb_active_trans
=
1
;
trx
->
n_mysql_tables_in_use
++
;
prebuilt
->
mysql_has_locked
=
TRUE
;
if
(
thd
->
tx_isolation
==
ISO_SERIALIZABLE
&&
prebuilt
->
select_lock_type
==
LOCK_NONE
)
{
...
...
@@ -3527,6 +3528,7 @@ ha_innobase::external_lock(
}
}
else
{
trx
->
n_mysql_tables_in_use
--
;
prebuilt
->
mysql_has_locked
=
FALSE
;
auto_inc_counter_for_this_stat
=
0
;
if
(
trx
->
n_mysql_tables_in_use
==
0
)
{
...
...
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