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
54b5ef84
Commit
54b5ef84
authored
Oct 29, 2009
by
Marc Alff
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug#38967 Unused mutex LOCK_Acl
Backport to 5.5
parent
667a72ad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
sql/mysql_priv.h
sql/mysql_priv.h
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+1
-3
No files found.
sql/mysql_priv.h
View file @
54b5ef84
...
...
@@ -1963,7 +1963,7 @@ extern FILE *bootstrap_file;
extern
int
bootstrap_error
;
extern
FILE
*
stderror_file
;
extern
pthread_key
(
MEM_ROOT
**
,
THR_MALLOC
);
extern
pthread_mutex_t
LOCK_mysql_create_db
,
LOCK_Acl
,
LOCK_open
,
LOCK_lock_db
,
extern
pthread_mutex_t
LOCK_mysql_create_db
,
LOCK_open
,
LOCK_lock_db
,
LOCK_mapped_file
,
LOCK_user_locks
,
LOCK_status
,
LOCK_error_log
,
LOCK_delayed_insert
,
LOCK_uuid_generator
,
LOCK_delayed_status
,
LOCK_delayed_create
,
LOCK_crypt
,
LOCK_timezone
,
...
...
sql/mysqld.cc
View file @
54b5ef84
...
...
@@ -653,7 +653,7 @@ SHOW_COMP_OPTION have_community_features;
pthread_key
(
MEM_ROOT
**
,
THR_MALLOC
);
pthread_key
(
THD
*
,
THR_THD
);
pthread_mutex_t
LOCK_mysql_create_db
,
LOCK_
Acl
,
LOCK_
open
,
LOCK_thread_count
,
pthread_mutex_t
LOCK_mysql_create_db
,
LOCK_open
,
LOCK_thread_count
,
LOCK_mapped_file
,
LOCK_status
,
LOCK_global_read_lock
,
LOCK_error_log
,
LOCK_uuid_generator
,
LOCK_delayed_insert
,
LOCK_delayed_status
,
LOCK_delayed_create
,
...
...
@@ -1422,7 +1422,6 @@ static void clean_up_mutexes()
{
(
void
)
pthread_mutex_destroy
(
&
LOCK_mysql_create_db
);
(
void
)
pthread_mutex_destroy
(
&
LOCK_lock_db
);
(
void
)
pthread_mutex_destroy
(
&
LOCK_Acl
);
(
void
)
rwlock_destroy
(
&
LOCK_grant
);
(
void
)
pthread_mutex_destroy
(
&
LOCK_open
);
(
void
)
pthread_mutex_destroy
(
&
LOCK_thread_count
);
...
...
@@ -3570,7 +3569,6 @@ static int init_thread_environment()
{
(
void
)
pthread_mutex_init
(
&
LOCK_mysql_create_db
,
MY_MUTEX_INIT_SLOW
);
(
void
)
pthread_mutex_init
(
&
LOCK_lock_db
,
MY_MUTEX_INIT_SLOW
);
(
void
)
pthread_mutex_init
(
&
LOCK_Acl
,
MY_MUTEX_INIT_SLOW
);
(
void
)
pthread_mutex_init
(
&
LOCK_open
,
MY_MUTEX_INIT_FAST
);
(
void
)
pthread_mutex_init
(
&
LOCK_thread_count
,
MY_MUTEX_INIT_FAST
);
(
void
)
pthread_mutex_init
(
&
LOCK_mapped_file
,
MY_MUTEX_INIT_SLOW
);
...
...
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