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
c2112f5f
Commit
c2112f5f
authored
Jun 21, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into kindahl-laptop.dnsalias.net:/home/bk/fix-mysql-5.1-rpl
parents
dc9db0d9
b358c3bd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
35 deletions
+23
-35
mysql-test/extra/rpl_tests/rpl_deadlock.test
mysql-test/extra/rpl_tests/rpl_deadlock.test
+3
-15
mysql-test/r/rpl_deadlock_innodb.result
mysql-test/r/rpl_deadlock_innodb.result
+20
-20
No files found.
mysql-test/extra/rpl_tests/rpl_deadlock.test
View file @
c2112f5f
...
...
@@ -72,11 +72,7 @@ sync_with_master;
select
*
from
t1
;
# check that repl-ed succeeded finally
select
*
from
t2
/* must be 1 */
;
# check that no error is reported
--
replace_column
1
# 7 # 8 # 9 # 16 # 22 # 23 # 33 #
--
replace_result
$MASTER_MYPORT
MASTER_MYPORT
--
vertical_results
show
slave
status
;
--
horizontal_results
source
include
/
show_slave_status
.
inc
;
# 2) Test lock wait timeout
...
...
@@ -93,11 +89,7 @@ sync_with_master;
select
*
from
t1
;
# check that repl-ed succeeded finally
select
*
from
t2
;
# check that no error is reported
--
replace_column
1
# 7 # 8 # 9 # 11 # 16 # 22 # 23 # 33 #
--
replace_result
$MASTER_MYPORT
MASTER_MYPORT
--
vertical_results
show
slave
status
;
--
horizontal_results
source
include
/
show_slave_status
.
inc
;
# Now we repeat 2), but with BEGIN in the same relay log as
# COMMIT (to see if seeking into hot log is ok).
...
...
@@ -117,11 +109,7 @@ commit;
sync_with_master
;
select
*
from
t1
;
select
*
from
t2
;
--
replace_column
1
# 7 # 8 # 9 # 11 # 16 # 22 # 23 # 33 #
--
replace_result
$MASTER_MYPORT
MASTER_MYPORT
--
vertical_results
show
slave
status
;
--
horizontal_results
source
include
/
show_slave_status
.
inc
;
connection
master
;
drop
table
t1
,
t2
,
t3
,
t4
;
...
...
mysql-test/r/rpl_deadlock_innodb.result
View file @
c2112f5f
...
...
@@ -44,14 +44,14 @@ a
select * from t2 /* must be 1 */;
a
0
show slave status
;
SHOW SLAVE STATUS
;
Slave_IO_State #
Master_Host 127.0.0.1
Master_User root
Master_Port MASTER_
MY
PORT
Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos
#
Read_Master_Log_Pos
1709
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001
...
...
@@ -66,7 +66,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos
#
Exec_Master_Log_Pos
1709
Relay_Log_Space #
Until_Condition None
Until_Log_File
...
...
@@ -79,8 +79,8 @@ Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno
0
Last_IO_Error
Last_IO_Errno
#
Last_IO_Error
#
Last_SQL_Errno 0
Last_SQL_Error
stop slave;
...
...
@@ -103,18 +103,18 @@ select * from t2;
a
0
0
show slave status
;
SHOW SLAVE STATUS
;
Slave_IO_State #
Master_Host 127.0.0.1
Master_User root
Master_Port MASTER_
MY
PORT
Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos
#
Read_Master_Log_Pos
1709
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001
Slave_IO_Running
#
Slave_IO_Running
Yes
Slave_SQL_Running Yes
Replicate_Do_DB
Replicate_Ignore_DB
...
...
@@ -125,7 +125,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos
#
Exec_Master_Log_Pos
1709
Relay_Log_Space #
Until_Condition None
Until_Log_File
...
...
@@ -138,8 +138,8 @@ Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno
0
Last_IO_Error
Last_IO_Errno
#
Last_IO_Error
#
Last_SQL_Errno 0
Last_SQL_Error
set @my_max_relay_log_size= @@global.max_relay_log_size;
...
...
@@ -167,18 +167,18 @@ a
0
0
0
show slave status
;
SHOW SLAVE STATUS
;
Slave_IO_State #
Master_Host 127.0.0.1
Master_User root
Master_Port MASTER_
MY
PORT
Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos
#
Read_Master_Log_Pos
1709
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001
Slave_IO_Running
#
Slave_IO_Running
Yes
Slave_SQL_Running Yes
Replicate_Do_DB
Replicate_Ignore_DB
...
...
@@ -189,7 +189,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos
#
Exec_Master_Log_Pos
1709
Relay_Log_Space #
Until_Condition None
Until_Log_File
...
...
@@ -202,8 +202,8 @@ Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno
0
Last_IO_Error
Last_IO_Errno
#
Last_IO_Error
#
Last_SQL_Errno 0
Last_SQL_Error
drop table t1,t2,t3,t4;
...
...
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