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
51d9707e
Commit
51d9707e
authored
Mar 10, 2020
by
Sachin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove remaining of cond_ddd
parent
cf7ad78e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
5 deletions
+1
-5
sql/mysqld.cc
sql/mysqld.cc
+0
-2
sql/mysqld.h
sql/mysqld.h
+0
-1
sql/rpl_mi.cc
sql/rpl_mi.cc
+0
-1
sql/rpl_mi.h
sql/rpl_mi.h
+1
-1
No files found.
sql/mysqld.cc
View file @
51d9707e
...
...
@@ -1021,7 +1021,6 @@ PSI_cond_key key_BINLOG_COND_xid_list,
key_item_func_sleep_cond
,
key_master_info_data_cond
,
key_master_info_start_cond
,
key_master_info_stop_cond
,
key_master_info_sleep_cond
,
key_master_info_cond_ddd
,
key_master_info_start_alter_list_cond
,
key_relay_log_info_data_cond
,
key_relay_log_info_log_space_cond
,
key_relay_log_info_start_cond
,
key_relay_log_info_stop_cond
,
...
...
@@ -1070,7 +1069,6 @@ static PSI_cond_info all_server_conds[]=
{
&
key_master_info_start_cond
,
"Master_info::start_cond"
,
0
},
{
&
key_master_info_stop_cond
,
"Master_info::stop_cond"
,
0
},
{
&
key_master_info_sleep_cond
,
"Master_info::sleep_cond"
,
0
},
{
&
key_master_info_cond_ddd
,
"Master_info::cond_ddd"
,
0
},
{
&
key_master_info_start_alter_list_cond
,
"Master_info::start_alter_list_cond"
,
0
},
{
&
key_relay_log_info_data_cond
,
"Relay_log_info::data_cond"
,
0
},
{
&
key_relay_log_info_log_space_cond
,
"Relay_log_info::log_space_cond"
,
0
},
...
...
sql/mysqld.h
View file @
51d9707e
...
...
@@ -370,7 +370,6 @@ extern PSI_cond_key key_BINLOG_COND_xid_list, key_BINLOG_update_cond,
key_item_func_sleep_cond
,
key_master_info_data_cond
,
key_master_info_start_cond
,
key_master_info_stop_cond
,
key_master_info_sleep_cond
,
key_master_info_cond_ddd
,
key_master_info_start_alter_list_cond
,
key_relay_log_info_data_cond
,
key_relay_log_info_log_space_cond
,
key_relay_log_info_start_cond
,
key_relay_log_info_stop_cond
,
...
...
sql/rpl_mi.cc
View file @
51d9707e
...
...
@@ -100,7 +100,6 @@ Master_info::Master_info(LEX_CSTRING *connection_name_arg,
mysql_cond_init
(
key_master_info_start_cond
,
&
start_cond
,
NULL
);
mysql_cond_init
(
key_master_info_stop_cond
,
&
stop_cond
,
NULL
);
mysql_cond_init
(
key_master_info_sleep_cond
,
&
sleep_cond
,
NULL
);
//mysql_cond_init(key_master_info_cond_ddd, &cond_ddd, NULL);
mysql_cond_init
(
key_master_info_start_alter_list_cond
,
&
start_alter_list_cond
,
NULL
);
}
...
...
sql/rpl_mi.h
View file @
51d9707e
...
...
@@ -249,7 +249,7 @@ class Master_info : public Slave_reporting_capability
IO_CACHE
file
;
mysql_mutex_t
data_lock
,
run_lock
,
sleep_lock
,
start_stop_lock
,
start_alter_lock
,
start_alter_list_lock
;
mysql_cond_t
data_cond
,
start_cond
,
stop_cond
,
sleep_cond
,
cond_ddd
,
start_alter_list_cond
;
mysql_cond_t
data_cond
,
start_cond
,
stop_cond
,
sleep_cond
,
start_alter_list_cond
;
THD
*
io_thd
;
MYSQL
*
mysql
;
uint32
file_id
;
/* for 3.23 load data infile */
...
...
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