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
6b4baf48
Commit
6b4baf48
authored
Aug 26, 2005
by
patg@radha.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
into radha.local:/Users/patg/mysql-build/mysql-4.1
parents
ff5d26d7
efff75ed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
sql/ha_blackhole.cc
sql/ha_blackhole.cc
+6
-4
sql/ha_blackhole.h
sql/ha_blackhole.h
+1
-0
No files found.
sql/ha_blackhole.cc
View file @
6b4baf48
...
@@ -124,14 +124,16 @@ int ha_blackhole::external_lock(THD *thd, int lock_type)
...
@@ -124,14 +124,16 @@ int ha_blackhole::external_lock(THD *thd, int lock_type)
}
}
uint
ha_blackhole
::
lock_count
(
void
)
const
{
DBUG_RETURN
(
0
);
}
THR_LOCK_DATA
**
ha_blackhole
::
store_lock
(
THD
*
thd
,
THR_LOCK_DATA
**
ha_blackhole
::
store_lock
(
THD
*
thd
,
THR_LOCK_DATA
**
to
,
THR_LOCK_DATA
**
to
,
enum
thr_lock_type
lock_type
)
enum
thr_lock_type
lock_type
)
{
{
if
(
lock_type
!=
TL_IGNORE
&&
lock
.
type
==
TL_UNLOCK
)
DEBUG_RETURN
(
to
);
lock
.
type
=
lock_type
;
*
to
++=
&
lock
;
return
to
;
}
}
...
...
sql/ha_blackhole.h
View file @
6b4baf48
...
@@ -80,6 +80,7 @@ class ha_blackhole: public handler
...
@@ -80,6 +80,7 @@ class ha_blackhole: public handler
void
position
(
const
byte
*
record
);
void
position
(
const
byte
*
record
);
void
info
(
uint
flag
);
void
info
(
uint
flag
);
int
external_lock
(
THD
*
thd
,
int
lock_type
);
int
external_lock
(
THD
*
thd
,
int
lock_type
);
uint
lock_count
(
void
)
const
;
int
create
(
const
char
*
name
,
TABLE
*
table_arg
,
int
create
(
const
char
*
name
,
TABLE
*
table_arg
,
HA_CREATE_INFO
*
create_info
);
HA_CREATE_INFO
*
create_info
);
THR_LOCK_DATA
**
store_lock
(
THD
*
thd
,
THR_LOCK_DATA
**
store_lock
(
THD
*
thd
,
...
...
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