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
40245772
Commit
40245772
authored
Dec 05, 2005
by
mleich@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-Z
parents
3ed00e85
2fd30b61
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
4 additions
and
13 deletions
+4
-13
mysql-test/r/rpl_deadlock.result
mysql-test/r/rpl_deadlock.result
+1
-1
mysql-test/r/rpl_relayrotate.result
mysql-test/r/rpl_relayrotate.result
+0
-3
mysql-test/r/rpl_until.result
mysql-test/r/rpl_until.result
+1
-1
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+0
-3
mysql-test/t/rpl_deadlock.test
mysql-test/t/rpl_deadlock.test
+1
-1
mysql-test/t/rpl_relayrotate.test
mysql-test/t/rpl_relayrotate.test
+0
-3
mysql-test/t/rpl_until.test
mysql-test/t/rpl_until.test
+1
-1
No files found.
mysql-test/r/rpl_deadlock.result
View file @
40245772
...
...
@@ -83,5 +83,5 @@ a
22
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_MYPORT 1 master-bin.000001 18911 # # master-bin.000001
Yes
Yes 0 0 18911 # None 0 No #
# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 18911 # # master-bin.000001
#
Yes 0 0 18911 # None 0 No #
drop table t1,t2,t3,t4;
mysql-test/r/rpl_relayrotate.result
View file @
40245772
...
...
@@ -16,7 +16,4 @@ master_pos_wait('master-bin.001',3000)>=0
select max(a) from t1;
max(a)
8000
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_MYPORT 1 master-bin.000001 735186 # # master-bin.000001 Yes Yes 0 0 735186 # None 0 No #
drop table t1;
mysql-test/r/rpl_until.result
View file @
40245772
...
...
@@ -49,7 +49,7 @@ n
2
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_MYPORT 1 master-bin.000001 776 slave-relay-bin.000004 # master-bin.000001
Yes
No 0 0 608 # Relay slave-relay-bin.000004 746 No #
# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 776 slave-relay-bin.000004 # master-bin.000001
#
No 0 0 608 # Relay slave-relay-bin.000004 746 No #
start slave;
stop slave;
start slave until master_log_file='master-bin.000001', master_log_pos=776;
...
...
mysql-test/t/disabled.def
View file @
40245772
...
...
@@ -11,7 +11,4 @@
##############################################################################
sp-goto : GOTO is currently is disabled - will be fixed in the future
rpl_relayrotate : Unstable test case, bug#12429
rpl_until : Unstable test case, bug#12429
rpl_deadlock : Unstable test case, bug#12429
kill : Unstable test case, bug#9712
mysql-test/t/rpl_deadlock.test
View file @
40245772
...
...
@@ -102,7 +102,7 @@ commit;
sync_with_master
;
select
*
from
t1
;
select
*
from
t2
;
--
replace_column
1
# 8 # 9 # 23 # 33 #
--
replace_column
1
# 8 # 9 #
11 #
23 # 33 #
--
replace_result
$MASTER_MYPORT
MASTER_MYPORT
show
slave
status
;
...
...
mysql-test/t/rpl_relayrotate.test
View file @
40245772
...
...
@@ -56,9 +56,6 @@ start slave;
# (the only statement with position>=3000 is COMMIT).
select
master_pos_wait
(
'master-bin.001'
,
3000
)
>=
0
;
select
max
(
a
)
from
t1
;
--
replace_column
1
# 8 # 9 # 23 # 33 #
--
replace_result
$MASTER_MYPORT
MASTER_MYPORT
show
slave
status
;
connection
master
;
# The following DROP is a very important cleaning task:
...
...
mysql-test/t/rpl_until.test
View file @
40245772
...
...
@@ -49,7 +49,7 @@ sleep 2;
wait_for_slave_to_stop
;
select
*
from
t2
;
--
replace_result
$MASTER_MYPORT
MASTER_MYPORT
--
replace_column
1
# 9 # 23 # 33 #
--
replace_column
1
# 9 #
11 #
23 # 33 #
show
slave
status
;
# clean up
...
...
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