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
4909a37e
Commit
4909a37e
authored
Nov 20, 2003
by
paul@ice.snake.net
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use same style for SHOW MASTER STATUS fields as
for SHOW SLAVE STATUS.
parent
53c93091
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
10 deletions
+10
-10
mysql-test/r/rpl000015.result
mysql-test/r/rpl000015.result
+1
-1
mysql-test/r/rpl_loaddata.result
mysql-test/r/rpl_loaddata.result
+2
-2
mysql-test/r/rpl_log_pos.result
mysql-test/r/rpl_log_pos.result
+2
-2
mysql-test/r/rpl_max_relay_size.result
mysql-test/r/rpl_max_relay_size.result
+1
-1
mysql-test/r/rpl_rotate_logs.result
mysql-test/r/rpl_rotate_logs.result
+1
-1
sql/repl_failsafe.cc
sql/repl_failsafe.cc
+1
-1
sql/sql_repl.cc
sql/sql_repl.cc
+2
-2
No files found.
mysql-test/r/rpl000015.result
View file @
4909a37e
reset master;
show master status;
File Position Binlog_
do_db Binlog_ignore_db
File Position Binlog_
Do_DB Binlog_Ignore_DB
master-bin.000001 79
reset slave;
show slave status;
...
...
mysql-test/r/rpl_loaddata.result
View file @
4909a37e
...
...
@@ -21,7 +21,7 @@ day id category name
2003-03-22 2161 c asdf
2003-03-22 2416 a bbbbb
show master status;
File Position Binlog_
do_db Binlog_ignore_db
File Position Binlog_
Do_DB Binlog_Ignore_DB
slave-bin.000001 964
drop table t1;
drop table t2;
...
...
@@ -63,6 +63,6 @@ terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
'\n##\n' starting by '>' ignore 1 lines;
ERROR 23000: Duplicate entry '2003-03-22' for key 1
show master status;
File Position Binlog_
do_db Binlog_ignore_db
File Position Binlog_
Do_DB Binlog_Ignore_DB
master-bin.000001 491
drop table t2;
mysql-test/r/rpl_log_pos.result
View file @
4909a37e
...
...
@@ -5,7 +5,7 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
show master status;
File Position Binlog_
do_db Binlog_ignore_db
File Position Binlog_
Do_DB Binlog_Ignore_DB
master-bin.000001 79
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
...
...
@@ -29,7 +29,7 @@ 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
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 173 slave-relay-bin.000001 4 master-bin.000001 No Yes 0 0 173 4 None 0 No #
show master status;
File Position Binlog_
do_db Binlog_ignore_db
File Position Binlog_
Do_DB Binlog_Ignore_DB
master-bin.000001 79
create table if not exists t1 (n int);
drop table if exists t1;
...
...
mysql-test/r/rpl_max_relay_size.result
View file @
4909a37e
...
...
@@ -57,5 +57,5 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 50583 slave-relay-bin.000010 52 master-bin.000001 Yes Yes 0 0 50583 52 None 0 No #
flush logs;
show master status;
File Position Binlog_
do_db Binlog_ignore_db
File Position Binlog_
Do_DB Binlog_Ignore_DB
master-bin.000002 4
mysql-test/r/rpl_rotate_logs.result
View file @
4909a37e
...
...
@@ -74,7 +74,7 @@ Log_name
master-bin.000003
master-bin.000004
show master status;
File Position Binlog_
do_db Binlog_ignore_db
File Position Binlog_
Do_DB Binlog_Ignore_DB
master-bin.000004 2886
select * from t4;
a
...
...
sql/repl_failsafe.cc
View file @
4909a37e
...
...
@@ -254,7 +254,7 @@ static int find_target_pos(LEX_MASTER_INFO *mi, IO_CACHE *log, char *errmsg)
it is reworked. Event's log_pos used to be preserved through
log-slave-updates to make code in repl_failsafe.cc work (this
function, SHOW NEW MASTER); but on the other side it caused unexpected
values in Exec_
master_log_p
os in A->B->C replication setup,
values in Exec_
Master_Log_P
os in A->B->C replication setup,
synchronization problems in master_pos_wait(), ... So we
(Dmitri & Guilhem) removed it.
...
...
sql/sql_repl.cc
View file @
4909a37e
...
...
@@ -1251,8 +1251,8 @@ int show_binlog_info(THD* thd)
field_list
.
push_back
(
new
Item_empty_string
(
"File"
,
FN_REFLEN
));
field_list
.
push_back
(
new
Item_return_int
(
"Position"
,
20
,
MYSQL_TYPE_LONGLONG
));
field_list
.
push_back
(
new
Item_empty_string
(
"Binlog_
do_db
"
,
255
));
field_list
.
push_back
(
new
Item_empty_string
(
"Binlog_
ignore_db
"
,
255
));
field_list
.
push_back
(
new
Item_empty_string
(
"Binlog_
Do_DB
"
,
255
));
field_list
.
push_back
(
new
Item_empty_string
(
"Binlog_
Ignore_DB
"
,
255
));
if
(
protocol
->
send_fields
(
&
field_list
,
1
))
DBUG_RETURN
(
-
1
);
...
...
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