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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
fa7897c6
Commit
fa7897c6
authored
Jul 29, 2005
by
sasha@asksasha.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updates for BUG#10780 - fixed slave I/O thread running status to No while attempting
to connect
parent
0abc5c94
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
4 deletions
+35
-4
mysql-test/r/rpl_slave_status.result
mysql-test/r/rpl_slave_status.result
+33
-2
mysql-test/t/rpl_slave_status.test
mysql-test/t/rpl_slave_status.test
+1
-0
sql/slave.cc
sql/slave.cc
+1
-1
sql/slave.h
sql/slave.h
+0
-1
No files found.
mysql-test/r/rpl_slave_status.result
View file @
fa7897c6
...
...
@@ -19,5 +19,36 @@ flush privileges;
stop slave;
start slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
Connecting to master 127.0.0.1 rpl MASTER_MYPORT 1 master-bin.000001 357 slave-relay-bin.000001 401 master-bin.000001 No Yes 0 0 357 401 None 0 No NULL
Slave_IO_State Connecting to master
Master_Host 127.0.0.1
Master_User rpl
Master_Port MASTER_MYPORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos 357
Relay_Log_File slave-relay-bin.000001
Relay_Log_Pos 401
Relay_Master_Log_File master-bin.000001
Slave_IO_Running No
Slave_SQL_Running Yes
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos 357
Relay_Log_Space 401
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master NULL
mysql-test/t/rpl_slave_status.test
View file @
fa7897c6
...
...
@@ -23,6 +23,7 @@ connection slave;
stop
slave
;
start
slave
;
--
replace_result
$MASTER_MYPORT
MASTER_MYPORT
--
vertical_results
show
slave
status
;
# end of 4.1 tests
sql/slave.cc
View file @
fa7897c6
...
...
@@ -3079,7 +3079,7 @@ slave_begin:
pthread_mutex_lock
(
&
LOCK_thread_count
);
threads
.
append
(
thd
);
pthread_mutex_unlock
(
&
LOCK_thread_count
);
mi
->
slave_running
=
MYSQL_SLAVE_RUN_INIT
;
mi
->
slave_running
=
1
;
mi
->
abort_slave
=
0
;
pthread_mutex_unlock
(
&
mi
->
run_lock
);
pthread_cond_broadcast
(
&
mi
->
start_cond
);
...
...
sql/slave.h
View file @
fa7897c6
...
...
@@ -112,7 +112,6 @@ enum enum_binlog_formats {
#define MYSQL_SLAVE_NOT_RUN 0
#define MYSQL_SLAVE_RUN_NOT_CONNECT 1
#define MYSQL_SLAVE_RUN_CONNECT 2
#define MYSQL_SLAVE_RUN_INIT 3
/****************************************************************************
...
...
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