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
1be5458a
Commit
1be5458a
authored
Nov 26, 2010
by
Bjorn Munch
Browse files
Options
Browse Files
Download
Plain Diff
upmerge 58515
parents
2405f2bc
7c6151ff
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
42 deletions
+14
-42
mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
...est/extra/rpl_tests/rpl_get_master_version_and_clock.test
+2
-6
mysql-test/include/restart_mysqld.inc
mysql-test/include/restart_mysqld.inc
+2
-6
mysql-test/suite/binlog/t/binlog_max_extension.test
mysql-test/suite/binlog/t/binlog_max_extension.test
+4
-12
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
+4
-12
mysql-test/suite/rpl/t/rpl_trigger.test
mysql-test/suite/rpl/t/rpl_trigger.test
+2
-6
No files found.
mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
View file @
1be5458a
...
@@ -53,9 +53,7 @@ source include/wait_for_slave_to_start.inc;
...
@@ -53,9 +53,7 @@ source include/wait_for_slave_to_start.inc;
connection
master
;
connection
master
;
# Write file to make mysql-test-run.pl expect the "crash", but don't start
# Write file to make mysql-test-run.pl expect the "crash", but don't start
# it until it's told to
# it until it's told to
--
write_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
echo
"wait"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
wait
EOF
# Send shutdown to the connected server and give
# Send shutdown to the connected server and give
# it 10 seconds to die before zapping it
# it 10 seconds to die before zapping it
...
@@ -85,9 +83,7 @@ source include/wait_for_slave_io_error.inc;
...
@@ -85,9 +83,7 @@ source include/wait_for_slave_io_error.inc;
eval
set
@@
global
.
debug
=
"-d,
$dbug_sync_point
"
;
eval
set
@@
global
.
debug
=
"-d,
$dbug_sync_point
"
;
# Write file to make mysql-test-run.pl start up the server again
# Write file to make mysql-test-run.pl start up the server again
--
append_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
echo
"restart"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
restart
EOF
connection
master
;
connection
master
;
# Turn on reconnect
# Turn on reconnect
...
...
mysql-test/include/restart_mysqld.inc
View file @
1be5458a
# Write file to make mysql-test-run.pl expect the "crash", but don't start
# Write file to make mysql-test-run.pl expect the "crash", but don't start
# it until it's told to
# it until it's told to
--
write_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
echo
"wait"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
wait
EOF
# Send shutdown to the connected server and give
# Send shutdown to the connected server and give
# it 10 seconds to die before zapping it
# it 10 seconds to die before zapping it
shutdown_server
10
;
shutdown_server
10
;
# Write file to make mysql-test-run.pl start up the server again
# Write file to make mysql-test-run.pl start up the server again
--
append_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
echo
"restart"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
restart
EOF
# Turn on reconnect
# Turn on reconnect
--
enable_reconnect
--
enable_reconnect
...
...
mysql-test/suite/binlog/t/binlog_max_extension.test
View file @
1be5458a
...
@@ -38,9 +38,7 @@ RESET MASTER;
...
@@ -38,9 +38,7 @@ RESET MASTER;
##########
##########
# 1. Stop master server
# 1. Stop master server
--
write_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
echo
"wait"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
wait
EOF
--
shutdown_server
10
--
shutdown_server
10
--
source
include
/
wait_until_disconnected
.
inc
--
source
include
/
wait_until_disconnected
.
inc
...
@@ -52,9 +50,7 @@ master-bin.2147483646
...
@@ -52,9 +50,7 @@ master-bin.2147483646
EOF
EOF
# 3. Restart the server
# 3. Restart the server
--
append_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
echo
"restart"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
restart
--
enable_reconnect
--
enable_reconnect
--
source
include
/
wait_until_connected_again
.
inc
--
source
include
/
wait_until_connected_again
.
inc
...
@@ -70,9 +66,7 @@ FLUSH LOGS;
...
@@ -70,9 +66,7 @@ FLUSH LOGS;
##############
##############
# 1. Stop the server
# 1. Stop the server
--
write_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
echo
"wait"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
wait
EOF
--
shutdown_server
10
--
shutdown_server
10
--
source
include
/
wait_until_disconnected
.
inc
--
source
include
/
wait_until_disconnected
.
inc
...
@@ -85,8 +79,6 @@ EOF
...
@@ -85,8 +79,6 @@ EOF
--
remove_file
$MYSQLD_DATADIR
/
master
-
bin
.
2147483647
--
remove_file
$MYSQLD_DATADIR
/
master
-
bin
.
2147483647
# 3. Restart the server
# 3. Restart the server
--
append_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
echo
"restart"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
restart
--
enable_reconnect
--
enable_reconnect
--
source
include
/
wait_until_connected_again
.
inc
--
source
include
/
wait_until_connected_again
.
inc
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
View file @
1be5458a
...
@@ -153,15 +153,11 @@ SET @@global.slave_net_timeout=50;
...
@@ -153,15 +153,11 @@ SET @@global.slave_net_timeout=50;
--
enable_warnings
--
enable_warnings
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$MASTER_MYPORT
MASTER_PORT
eval
CHANGE
MASTER
TO
MASTER_HOST
=
'127.0.0.1'
,
MASTER_PORT
=
$MASTER_MYPORT
,
MASTER_USER
=
'root'
,
MASTER_HEARTBEAT_PERIOD
=
30
;
eval
CHANGE
MASTER
TO
MASTER_HOST
=
'127.0.0.1'
,
MASTER_PORT
=
$MASTER_MYPORT
,
MASTER_USER
=
'root'
,
MASTER_HEARTBEAT_PERIOD
=
30
;
--
write_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
2.
expect
--
exec
echo
"wait"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
2.
expect
wait
EOF
--
echo
Reload
slave
--
echo
Reload
slave
--
shutdown_server
10
--
shutdown_server
10
--
source
include
/
wait_until_disconnected
.
inc
--
source
include
/
wait_until_disconnected
.
inc
--
append_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
2.
expect
--
exec
echo
"restart"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
2.
expect
restart
EOF
--
enable_reconnect
--
enable_reconnect
--
source
include
/
wait_until_connected_again
.
inc
--
source
include
/
wait_until_connected_again
.
inc
SHOW
GLOBAL
STATUS
LIKE
'slave_heartbeat_period'
;
SHOW
GLOBAL
STATUS
LIKE
'slave_heartbeat_period'
;
...
@@ -456,15 +452,11 @@ let $status_var_comparsion= >;
...
@@ -456,15 +452,11 @@ let $status_var_comparsion= >;
--
source
include
/
wait_for_status_var
.
inc
--
source
include
/
wait_for_status_var
.
inc
--
echo
Heartbeat
event
received
--
echo
Heartbeat
event
received
--
connection
master
--
connection
master
--
write_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
echo
"wait"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
wait
EOF
--
echo
Reload
master
--
echo
Reload
master
--
shutdown_server
10
--
shutdown_server
10
--
source
include
/
wait_until_disconnected
.
inc
--
source
include
/
wait_until_disconnected
.
inc
--
append_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
echo
"restart"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
restart
EOF
--
enable_reconnect
--
enable_reconnect
--
source
include
/
wait_until_connected_again
.
inc
--
source
include
/
wait_until_connected_again
.
inc
--
connection
slave
--
connection
slave
...
...
mysql-test/suite/rpl/t/rpl_trigger.test
View file @
1be5458a
...
@@ -315,9 +315,7 @@ FLUSH LOGS;
...
@@ -315,9 +315,7 @@ FLUSH LOGS;
# Stop master server
# Stop master server
--
echo
-->
Stop
master
server
--
echo
-->
Stop
master
server
--
write_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
echo
"wait"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
wait
EOF
--
shutdown_server
10
--
shutdown_server
10
--
source
include
/
wait_until_disconnected
.
inc
--
source
include
/
wait_until_disconnected
.
inc
# Replace binlog
# Replace binlog
...
@@ -325,9 +323,7 @@ remove_file $MYSQLD_DATADIR/master-bin.000001;
...
@@ -325,9 +323,7 @@ remove_file $MYSQLD_DATADIR/master-bin.000001;
copy_file
$MYSQL_TEST_DIR
/
std_data
/
bug16266
.
000001
$MYSQLD_DATADIR
/
master
-
bin
.
000001
;
copy_file
$MYSQL_TEST_DIR
/
std_data
/
bug16266
.
000001
$MYSQLD_DATADIR
/
master
-
bin
.
000001
;
--
echo
-->
Start
master
server
--
echo
-->
Start
master
server
--
append_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
echo
"restart"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
restart
EOF
--
enable_reconnect
--
enable_reconnect
--
source
include
/
wait_until_connected_again
.
inc
--
source
include
/
wait_until_connected_again
.
inc
let
$binlog_version
=
query_get_value
(
SHOW
BINLOG
EVENTS
,
Info
,
1
);
let
$binlog_version
=
query_get_value
(
SHOW
BINLOG
EVENTS
,
Info
,
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