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
35d9a7b8
Commit
35d9a7b8
authored
Apr 10, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug5390
parents
45945b84
23549493
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
236 additions
and
121 deletions
+236
-121
mysql-test/r/lock.result
mysql-test/r/lock.result
+11
-0
mysql-test/t/lock.test
mysql-test/t/lock.test
+18
-0
sql/lock.cc
sql/lock.cc
+197
-117
sql/sql_insert.cc
sql/sql_insert.cc
+4
-1
sql/table.h
sql/table.h
+6
-3
No files found.
mysql-test/r/lock.result
View file @
35d9a7b8
...
...
@@ -47,6 +47,17 @@ unlock tables;
lock tables t1 write, t1 as t1_alias read;
insert into t1 select index1,nr from t1 as t1_alias;
drop table t1,t2;
create table t1 (c1 int);
create table t2 (c1 int);
create table t3 (c1 int);
lock tables t1 write, t2 write, t3 write;
drop table t2, t3, t1;
create table t1 (c1 int);
create table t2 (c1 int);
create table t3 (c1 int);
lock tables t1 write, t2 write, t3 write, t1 as t4 read;
alter table t2 add column c2 int;
drop table t1, t2, t3;
create table t1 ( a int(11) not null auto_increment, primary key(a));
create table t2 ( a int(11) not null auto_increment, primary key(a));
lock tables t1 write, t2 read;
...
...
mysql-test/t/lock.test
View file @
35d9a7b8
...
...
@@ -61,6 +61,24 @@ insert into t1 select index1,nr from t1 as t1_alias;
drop
table
t1
,
t2
;
#
# BUG#5390 - problems with merge tables
# Supplement test for the after-fix optimization
# Check that a dropped table is correctly removed from a lock.
create
table
t1
(
c1
int
);
create
table
t2
(
c1
int
);
create
table
t3
(
c1
int
);
lock
tables
t1
write
,
t2
write
,
t3
write
;
# This removes one table after the other from the lock.
drop
table
t2
,
t3
,
t1
;
#
# Check that a lock merge works.
create
table
t1
(
c1
int
);
create
table
t2
(
c1
int
);
create
table
t3
(
c1
int
);
lock
tables
t1
write
,
t2
write
,
t3
write
,
t1
as
t4
read
;
alter
table
t2
add
column
c2
int
;
drop
table
t1
,
t2
,
t3
;
# Bug7241 - Invalid response when DELETE .. USING and LOCK TABLES used.
#
create
table
t1
(
a
int
(
11
)
not
null
auto_increment
,
primary
key
(
a
));
...
...
sql/lock.cc
View file @
35d9a7b8
This diff is collapsed.
Click to expand it.
sql/sql_insert.cc
View file @
35d9a7b8
...
...
@@ -1536,7 +1536,10 @@ TABLE *delayed_insert::get_local_table(THD* client_thd)
/* Adjust in_use for pointing to client thread */
copy
->
in_use
=
client_thd
;
/* Adjust lock_count. This table object is not part of a lock. */
copy
->
lock_count
=
0
;
return
copy
;
/* Got fatal error */
...
...
sql/table.h
View file @
35d9a7b8
...
...
@@ -236,7 +236,10 @@ struct st_table {
*/
timestamp_auto_set_type
timestamp_field_type
;
table_map
map
;
/* ID bit of table (1,2,4,8,16...) */
uint
lock_position
;
/* Position in MYSQL_LOCK.table */
uint
lock_data_start
;
/* Start pos. in MYSQL_LOCK.locks */
uint
lock_count
;
/* Number of locks */
uint
tablenr
,
used_fields
;
uint
temp_pool_slot
;
/* Used by intern temp tables */
uint
status
;
/* What's in record[0] */
...
...
@@ -245,8 +248,8 @@ struct st_table {
uint
derived_select_number
;
int
current_lock
;
/* Type of lock on table */
my_bool
copy_blobs
;
/* copy_blobs when storing */
/*
/*
0 or JOIN_TYPE_{LEFT|RIGHT}. Currently this is only compared to 0.
If maybe_null !=0, this table is inner w.r.t. some outer join operation,
and null_row may be true.
...
...
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