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
442c03f0
Commit
442c03f0
authored
Sep 08, 2001
by
monty@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bugs when using LOCK TABLES with BDB tables
Optimized remove of key when using internal cursor in BDB tables.
parent
e24bdfa8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
24 deletions
+43
-24
mysql-test/r/bdb.result
mysql-test/r/bdb.result
+3
-0
mysql-test/t/bdb.test
mysql-test/t/bdb.test
+19
-8
sql/ha_berkeley.cc
sql/ha_berkeley.cc
+16
-11
sql/ha_berkeley.h
sql/ha_berkeley.h
+1
-1
sql/lock.cc
sql/lock.cc
+4
-4
No files found.
mysql-test/r/bdb.result
View file @
442c03f0
...
@@ -524,3 +524,6 @@ a b a b
...
@@ -524,3 +524,6 @@ a b a b
a b
a b
1 1
1 1
1 2
1 2
id id2 id3 dummy1
id id2 id3 dummy1
NULL NULL NULL NULL
mysql-test/t/bdb.test
View file @
442c03f0
...
@@ -727,13 +727,24 @@ DROP TABLE t1,t2;
...
@@ -727,13 +727,24 @@ DROP TABLE t1,t2;
# Test problem with joining table to itself on a multi-part unique key
# Test problem with joining table to itself on a multi-part unique key
#
#
drop
table
if
exists
t
;
drop
table
if
exists
t1
;
create
table
t
(
a
int
(
11
)
not
null
,
b
int
(
11
)
not
null
,
unique
(
a
,
b
))
type
=
bdb
;
create
table
t1
(
a
int
(
11
)
not
null
,
b
int
(
11
)
not
null
,
unique
(
a
,
b
))
type
=
bdb
;
insert
into
t1
values
(
1
,
1
),
(
1
,
2
);
insert
into
t
values
(
1
,
1
),
(
1
,
2
);
select
*
from
t1
where
a
=
1
;
select
t1
.*
,
t2
.*
from
t1
,
t1
t2
where
t1
.
a
=
t2
.
a
and
t2
.
a
=
1
;
select
*
from
t1
where
a
=
1
;
drop
table
t1
;
select
*
from
t
where
a
=
1
;
#
select
t1
.*
,
t2
.*
from
t
t1
,
t
t2
where
t1
.
a
=
t2
.
a
and
t2
.
a
=
1
;
# This caused a deadlock in BDB internal locks
select
*
from
t
where
a
=
1
;
#
drop
table
t
;
create
table
t1
(
id
int
NOT
NULL
,
id2
int
NOT
NULL
,
id3
int
NOT
NULL
,
dummy1
char
(
30
),
primary
key
(
id
,
id2
),
index
index_id3
(
id3
))
type
=
bdb
;
insert
into
t1
values
(
0
,
0
,
0
,
'ABCDEFGHIJ'
);
create
table
t2
(
id
int
NOT
NULL
,
primary
key
(
id
))
type
=
bdb
;
LOCK
TABLES
t1
WRITE
,
t2
WRITE
;
insert
into
t2
values
(
1
);
SELECT
t1
.*
FROM
t1
WHERE
id
IN
(
1
);
SELECT
t1
.*
FROM
t2
left
outer
join
t1
on
(
t1
.
id
=
t2
.
id
);
delete
from
t1
where
id3
>=
0
and
id3
<=
0
;
drop
table
t1
,
t2
;
sql/ha_berkeley.cc
View file @
442c03f0
...
@@ -1306,7 +1306,7 @@ int ha_berkeley::delete_row(const byte * record)
...
@@ -1306,7 +1306,7 @@ int ha_berkeley::delete_row(const byte * record)
int
ha_berkeley
::
index_init
(
uint
keynr
)
int
ha_berkeley
::
index_init
(
uint
keynr
)
{
{
int
error
;
int
error
;
DBUG_ENTER
(
"index_init"
);
DBUG_ENTER
(
"
ha_berkeley::
index_init"
);
DBUG_PRINT
(
"enter"
,(
"table: '%s' key: %d"
,
table
->
real_name
,
keynr
));
DBUG_PRINT
(
"enter"
,(
"table: '%s' key: %d"
,
table
->
real_name
,
keynr
));
/*
/*
...
@@ -1347,7 +1347,7 @@ int ha_berkeley::index_end()
...
@@ -1347,7 +1347,7 @@ int ha_berkeley::index_end()
int
ha_berkeley
::
read_row
(
int
error
,
char
*
buf
,
uint
keynr
,
DBT
*
row
,
int
ha_berkeley
::
read_row
(
int
error
,
char
*
buf
,
uint
keynr
,
DBT
*
row
,
DBT
*
found_key
,
bool
read_next
)
DBT
*
found_key
,
bool
read_next
)
{
{
DBUG_ENTER
(
"read_row"
);
DBUG_ENTER
(
"
ha_berkeley::
read_row"
);
if
(
error
)
if
(
error
)
{
{
if
(
error
==
DB_NOTFOUND
||
error
==
DB_KEYEMPTY
)
if
(
error
==
DB_NOTFOUND
||
error
==
DB_KEYEMPTY
)
...
@@ -1399,6 +1399,7 @@ int ha_berkeley::index_read_idx(byte * buf, uint keynr, const byte * key,
...
@@ -1399,6 +1399,7 @@ int ha_berkeley::index_read_idx(byte * buf, uint keynr, const byte * key,
statistic_increment
(
ha_read_key_count
,
&
LOCK_status
);
statistic_increment
(
ha_read_key_count
,
&
LOCK_status
);
DBUG_ENTER
(
"index_read_idx"
);
DBUG_ENTER
(
"index_read_idx"
);
current_row
.
flags
=
DB_DBT_REALLOC
;
current_row
.
flags
=
DB_DBT_REALLOC
;
active_index
=
-
1
;
DBUG_RETURN
(
read_row
(
key_file
[
keynr
]
->
get
(
key_file
[
keynr
],
transaction
,
DBUG_RETURN
(
read_row
(
key_file
[
keynr
]
->
get
(
key_file
[
keynr
],
transaction
,
pack_key
(
&
last_key
,
keynr
,
key_buff
,
key
,
pack_key
(
&
last_key
,
keynr
,
key_buff
,
key
,
key_len
),
key_len
),
...
@@ -1413,7 +1414,7 @@ int ha_berkeley::index_read(byte * buf, const byte * key,
...
@@ -1413,7 +1414,7 @@ int ha_berkeley::index_read(byte * buf, const byte * key,
DBT
row
;
DBT
row
;
int
error
;
int
error
;
KEY
*
key_info
=
&
table
->
key_info
[
active_index
];
KEY
*
key_info
=
&
table
->
key_info
[
active_index
];
DBUG_ENTER
(
"index_read"
);
DBUG_ENTER
(
"
ha_berkeley::
index_read"
);
statistic_increment
(
ha_read_key_count
,
&
LOCK_status
);
statistic_increment
(
ha_read_key_count
,
&
LOCK_status
);
bzero
((
char
*
)
&
row
,
sizeof
(
row
));
bzero
((
char
*
)
&
row
,
sizeof
(
row
));
...
@@ -1518,8 +1519,9 @@ int ha_berkeley::index_last(byte * buf)
...
@@ -1518,8 +1519,9 @@ int ha_berkeley::index_last(byte * buf)
int
ha_berkeley
::
rnd_init
(
bool
scan
)
int
ha_berkeley
::
rnd_init
(
bool
scan
)
{
{
DBUG_ENTER
(
"rnd_init"
);
current_row
.
flags
=
DB_DBT_REALLOC
;
current_row
.
flags
=
DB_DBT_REALLOC
;
return
index_init
(
primary_key
);
DBUG_RETURN
(
index_init
(
primary_key
)
);
}
}
int
ha_berkeley
::
rnd_end
()
int
ha_berkeley
::
rnd_end
()
...
@@ -1534,7 +1536,7 @@ int ha_berkeley::rnd_next(byte *buf)
...
@@ -1534,7 +1536,7 @@ int ha_berkeley::rnd_next(byte *buf)
statistic_increment
(
ha_read_rnd_next_count
,
&
LOCK_status
);
statistic_increment
(
ha_read_rnd_next_count
,
&
LOCK_status
);
bzero
((
char
*
)
&
row
,
sizeof
(
row
));
bzero
((
char
*
)
&
row
,
sizeof
(
row
));
DBUG_RETURN
(
read_row
(
cursor
->
c_get
(
cursor
,
&
last_key
,
&
row
,
DB_NEXT
),
DBUG_RETURN
(
read_row
(
cursor
->
c_get
(
cursor
,
&
last_key
,
&
row
,
DB_NEXT
),
(
char
*
)
buf
,
active_index
,
&
row
,
&
last_key
,
1
));
(
char
*
)
buf
,
primary_key
,
&
row
,
&
last_key
,
1
));
}
}
...
@@ -1564,10 +1566,11 @@ int ha_berkeley::rnd_pos(byte * buf, byte *pos)
...
@@ -1564,10 +1566,11 @@ int ha_berkeley::rnd_pos(byte * buf, byte *pos)
DBT
db_pos
;
DBT
db_pos
;
statistic_increment
(
ha_read_rnd_count
,
&
LOCK_status
);
statistic_increment
(
ha_read_rnd_count
,
&
LOCK_status
);
active_index
=
(
uint
)
-
1
;
// Don't delete via cursor
return
read_row
(
file
->
get
(
file
,
transaction
,
return
read_row
(
file
->
get
(
file
,
transaction
,
get_pos
(
&
db_pos
,
pos
),
get_pos
(
&
db_pos
,
pos
),
&
current_row
,
0
),
&
current_row
,
0
),
(
char
*
)
buf
,
active_index
,
&
current_row
,
(
DBT
*
)
0
,
0
);
(
char
*
)
buf
,
primary_key
,
&
current_row
,
(
DBT
*
)
0
,
0
);
}
}
void
ha_berkeley
::
position
(
const
byte
*
record
)
void
ha_berkeley
::
position
(
const
byte
*
record
)
...
@@ -1582,10 +1585,10 @@ void ha_berkeley::position(const byte *record)
...
@@ -1582,10 +1585,10 @@ void ha_berkeley::position(const byte *record)
void
ha_berkeley
::
info
(
uint
flag
)
void
ha_berkeley
::
info
(
uint
flag
)
{
{
DBUG_ENTER
(
"info"
);
DBUG_ENTER
(
"
ha_berkeley::
info"
);
if
(
flag
&
HA_STATUS_VARIABLE
)
if
(
flag
&
HA_STATUS_VARIABLE
)
{
{
records
=
share
->
rows
;
// Just to get optimisations right
records
=
share
->
rows
+
changed_rows
;
// Just to get optimisations right
deleted
=
0
;
deleted
=
0
;
}
}
if
((
flag
&
HA_STATUS_CONST
)
||
version
!=
share
->
version
)
if
((
flag
&
HA_STATUS_CONST
)
||
version
!=
share
->
version
)
...
@@ -1663,14 +1666,13 @@ int ha_berkeley::external_lock(THD *thd, int lock_type)
...
@@ -1663,14 +1666,13 @@ int ha_berkeley::external_lock(THD *thd, int lock_type)
{
{
if
(
!
thd
->
transaction
.
bdb_lock_count
++
)
if
(
!
thd
->
transaction
.
bdb_lock_count
++
)
{
{
changed_rows
=
0
;
DBUG_ASSERT
(
thd
->
transaction
.
stmt
.
bdb_tid
==
0
)
;
transaction
=
0
;
// Safety
transaction
=
0
;
// Safety
/* First table lock, start transaction */
/* First table lock, start transaction */
if
((
thd
->
options
&
(
OPTION_NOT_AUTO_COMMIT
|
OPTION_BEGIN
|
if
((
thd
->
options
&
(
OPTION_NOT_AUTO_COMMIT
|
OPTION_BEGIN
|
OPTION_TABLE_LOCK
))
&&
OPTION_TABLE_LOCK
))
&&
!
thd
->
transaction
.
all
.
bdb_tid
)
!
thd
->
transaction
.
all
.
bdb_tid
)
{
{
DBUG_ASSERT
(
thd
->
transaction
.
stmt
.
bdb_tid
==
0
);
/* We have to start a master transaction */
/* We have to start a master transaction */
DBUG_PRINT
(
"trans"
,(
"starting transaction all"
));
DBUG_PRINT
(
"trans"
,(
"starting transaction all"
));
if
((
error
=
txn_begin
(
db_env
,
0
,
if
((
error
=
txn_begin
(
db_env
,
0
,
...
@@ -1700,6 +1702,7 @@ int ha_berkeley::external_lock(THD *thd, int lock_type)
...
@@ -1700,6 +1702,7 @@ int ha_berkeley::external_lock(THD *thd, int lock_type)
{
{
lock
.
type
=
TL_UNLOCK
;
// Unlocked
lock
.
type
=
TL_UNLOCK
;
// Unlocked
thread_safe_add
(
share
->
rows
,
changed_rows
,
&
share
->
mutex
);
thread_safe_add
(
share
->
rows
,
changed_rows
,
&
share
->
mutex
);
changed_rows
=
0
;
if
(
!--
thd
->
transaction
.
bdb_lock_count
)
if
(
!--
thd
->
transaction
.
bdb_lock_count
)
{
{
if
(
thd
->
transaction
.
stmt
.
bdb_tid
)
if
(
thd
->
transaction
.
stmt
.
bdb_tid
)
...
@@ -1736,8 +1739,8 @@ int ha_berkeley::start_stmt(THD *thd)
...
@@ -1736,8 +1739,8 @@ int ha_berkeley::start_stmt(THD *thd)
error
=
txn_begin
(
db_env
,
(
DB_TXN
*
)
thd
->
transaction
.
all
.
bdb_tid
,
error
=
txn_begin
(
db_env
,
(
DB_TXN
*
)
thd
->
transaction
.
all
.
bdb_tid
,
(
DB_TXN
**
)
&
thd
->
transaction
.
stmt
.
bdb_tid
,
(
DB_TXN
**
)
&
thd
->
transaction
.
stmt
.
bdb_tid
,
0
);
0
);
transaction
=
(
DB_TXN
*
)
thd
->
transaction
.
stmt
.
bdb_tid
;
}
}
transaction
=
(
DB_TXN
*
)
thd
->
transaction
.
stmt
.
bdb_tid
;
DBUG_RETURN
(
error
);
DBUG_RETURN
(
error
);
}
}
...
@@ -1942,6 +1945,8 @@ longlong ha_berkeley::get_auto_increment()
...
@@ -1942,6 +1945,8 @@ longlong ha_berkeley::get_auto_increment()
longlong
nr
=
1
;
// Default if error or new key
longlong
nr
=
1
;
// Default if error or new key
int
error
;
int
error
;
(
void
)
ha_berkeley
::
extra
(
HA_EXTRA_KEYREAD
);
(
void
)
ha_berkeley
::
extra
(
HA_EXTRA_KEYREAD
);
/* Set 'active_index' */
ha_berkeley
::
index_init
(
table
->
next_number_index
);
ha_berkeley
::
index_init
(
table
->
next_number_index
);
if
(
!
table
->
next_number_key_offset
)
if
(
!
table
->
next_number_key_offset
)
...
...
sql/ha_berkeley.h
View file @
442c03f0
...
@@ -93,7 +93,7 @@ class ha_berkeley: public handler
...
@@ -93,7 +93,7 @@ class ha_berkeley: public handler
HA_BLOB_KEY
|
HA_NOT_EXACT_COUNT
|
HA_BLOB_KEY
|
HA_NOT_EXACT_COUNT
|
HA_PRIMARY_KEY_IN_READ_INDEX
|
HA_DROP_BEFORE_CREATE
|
HA_PRIMARY_KEY_IN_READ_INDEX
|
HA_DROP_BEFORE_CREATE
|
HA_AUTO_PART_KEY
),
HA_AUTO_PART_KEY
),
last_dup_key
((
uint
)
-
1
),
version
(
0
),
using_ignore
(
0
)
changed_rows
(
0
),
last_dup_key
((
uint
)
-
1
),
version
(
0
),
using_ignore
(
0
)
{
{
}
}
~
ha_berkeley
()
{}
~
ha_berkeley
()
{}
...
...
sql/lock.cc
View file @
442c03f0
...
@@ -170,10 +170,9 @@ void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock)
...
@@ -170,10 +170,9 @@ void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock)
{
{
DBUG_ENTER
(
"mysql_unlock_tables"
);
DBUG_ENTER
(
"mysql_unlock_tables"
);
if
(
sql_lock
->
lock_count
)
if
(
sql_lock
->
lock_count
)
{
thr_multi_unlock
(
sql_lock
->
locks
,
sql_lock
->
lock_count
);
thr_multi_unlock
(
sql_lock
->
locks
,
sql_lock
->
lock_count
);
if
(
sql_lock
->
table_count
)
VOID
(
unlock_external
(
thd
,
sql_lock
->
table
,
sql_lock
->
table_count
));
VOID
(
unlock_external
(
thd
,
sql_lock
->
table
,
sql_lock
->
table_count
));
}
my_free
((
gptr
)
sql_lock
,
MYF
(
0
));
my_free
((
gptr
)
sql_lock
,
MYF
(
0
));
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
@@ -317,7 +316,7 @@ static int unlock_external(THD *thd, TABLE **table,uint count)
...
@@ -317,7 +316,7 @@ static int unlock_external(THD *thd, TABLE **table,uint count)
DBUG_ENTER
(
"unlock_external"
);
DBUG_ENTER
(
"unlock_external"
);
error_code
=
0
;
error_code
=
0
;
for
(;
count
--
;
table
++
)
do
{
{
if
((
*
table
)
->
current_lock
!=
F_UNLCK
)
if
((
*
table
)
->
current_lock
!=
F_UNLCK
)
{
{
...
@@ -325,7 +324,8 @@ static int unlock_external(THD *thd, TABLE **table,uint count)
...
@@ -325,7 +324,8 @@ static int unlock_external(THD *thd, TABLE **table,uint count)
if
((
error
=
(
*
table
)
->
file
->
external_lock
(
thd
,
F_UNLCK
)))
if
((
error
=
(
*
table
)
->
file
->
external_lock
(
thd
,
F_UNLCK
)))
error_code
=
error
;
error_code
=
error
;
}
}
}
table
++
;
}
while
(
--
count
);
if
(
error_code
)
if
(
error_code
)
print_lock_error
(
error_code
);
print_lock_error
(
error_code
);
DBUG_RETURN
(
error_code
);
DBUG_RETURN
(
error_code
);
...
...
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