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
b11dee73
Commit
b11dee73
authored
Oct 19, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport test cases fixes from 5.0
parent
c2b656fa
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
56 additions
and
54 deletions
+56
-54
client/mysqldump.c
client/mysqldump.c
+1
-0
mysql-test/include/have_lowercase0.inc
mysql-test/include/have_lowercase0.inc
+2
-2
mysql-test/r/rpl000015.result
mysql-test/r/rpl000015.result
+3
-3
mysql-test/r/rpl_change_master.result
mysql-test/r/rpl_change_master.result
+1
-1
mysql-test/r/rpl_error_ignored_table.result
mysql-test/r/rpl_error_ignored_table.result
+1
-1
mysql-test/r/rpl_loaddata.result
mysql-test/r/rpl_loaddata.result
+3
-3
mysql-test/r/rpl_log.result
mysql-test/r/rpl_log.result
+1
-1
mysql-test/r/rpl_max_relay_size.result
mysql-test/r/rpl_max_relay_size.result
+18
-18
mysql-test/r/rpl_replicate_do.result
mysql-test/r/rpl_replicate_do.result
+1
-1
mysql-test/t/lowercase_table3.test
mysql-test/t/lowercase_table3.test
+2
-6
mysql-test/t/mysql_protocols.test
mysql-test/t/mysql_protocols.test
+2
-0
mysql-test/t/rpl000015.test
mysql-test/t/rpl000015.test
+4
-4
mysql-test/t/rpl_change_master.test
mysql-test/t/rpl_change_master.test
+2
-1
mysql-test/t/rpl_drop_db.test
mysql-test/t/rpl_drop_db.test
+2
-0
mysql-test/t/rpl_error_ignored_table.test
mysql-test/t/rpl_error_ignored_table.test
+1
-1
mysql-test/t/rpl_loaddata.test
mysql-test/t/rpl_loaddata.test
+3
-3
mysql-test/t/rpl_log-master.opt
mysql-test/t/rpl_log-master.opt
+1
-1
mysql-test/t/rpl_log.test
mysql-test/t/rpl_log.test
+1
-1
mysql-test/t/rpl_max_relay_size.test
mysql-test/t/rpl_max_relay_size.test
+6
-6
mysql-test/t/rpl_replicate_do.test
mysql-test/t/rpl_replicate_do.test
+1
-1
No files found.
client/mysqldump.c
View file @
b11dee73
...
...
@@ -785,6 +785,7 @@ static void DBerror(MYSQL *mysql, const char *when)
DBUG_ENTER
(
"DBerror"
);
fprintf
(
stderr
,
"%s: Got error: %d: %s %s
\n
"
,
my_progname
,
mysql_errno
(
mysql
),
mysql_error
(
mysql
),
when
);
fflush
(
stderr
);
safe_exit
(
EX_MYSQLERR
);
DBUG_VOID_RETURN
;
}
/* DBerror */
...
...
mysql-test/include/have_lowercase0.inc
View file @
b11dee73
--
require
r
/
lowercase0
.
require
--
disable_query_log
;
--
disable_query_log
show
variables
like
"lower_case_%"
;
--
enable_query_log
;
--
enable_query_log
mysql-test/r/rpl000015.result
View file @
b11dee73
...
...
@@ -8,16 +8,16 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File
change master to master_host='127.0.0.1';
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 test MASTER_PORT 7 4
slave-relay-bin.000001 4 No No 0 0 0 4
None 0 No #
# 127.0.0.1 test MASTER_PORT 7 4
# # No No 0 0 0 #
None 0 No #
change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=MASTER_PORT;
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 7 4
slave-relay-bin.000001 4 No No 0 0 0 4
None 0 No #
# 127.0.0.1 root MASTER_PORT 7 4
# # No No 0 0 0 #
None 0 No #
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
# 127.0.0.1 root MASTER_PORT 7 master-bin.000001 79
slave-relay-bin.000001 123 master-bin.000001 Yes Yes 0 0 79 123
None 0 No #
# 127.0.0.1 root MASTER_PORT 7 master-bin.000001 79
# # master-bin.000001 Yes Yes 0 0 79 #
None 0 No #
drop table if exists t1;
create table t1 (n int);
insert into t1 values (10),(45),(90);
...
...
mysql-test/r/rpl_change_master.result
View file @
b11dee73
...
...
@@ -20,7 +20,7 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File
change master to master_user='root';
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 214
slave-relay-bin.000001 4 master-bin.000001 No No 0 0 214 4
None 0 No #
# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 214
# # master-bin.000001 No No 0 0 214 #
None 0 No #
select release_lock("a");
release_lock("a")
1
...
...
mysql-test/r/rpl_error_ignored_table.result
View file @
b11dee73
...
...
@@ -9,7 +9,7 @@ insert into t1 values (1),(1);
ERROR 23000: Duplicate entry '1' for key 1
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 213
slave-relay-bin.000002 257 master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 213 257
None 0 No #
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 213
# # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 213 #
None 0 No #
show tables like 't1';
Tables_in_test (t1)
drop table t1;
...
...
mysql-test/r/rpl_loaddata.result
View file @
b11dee73
...
...
@@ -33,7 +33,7 @@ set global sql_slave_skip_counter=1;
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
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1311
slave-relay-bin.000002 1355 master-bin.000001 Yes Yes 0 0 1311 1355
None 0 No #
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1311
# # master-bin.000001 Yes Yes 0 0 1311 #
None 0 No #
set sql_log_bin=0;
delete from t1;
set sql_log_bin=1;
...
...
@@ -43,7 +43,7 @@ change master to master_user='test';
change master to master_user='root';
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 1419
slave-relay-bin.000001 4 master-bin.000001 No No 0 0 1419 4
None 0 No #
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1419
# # master-bin.000001 No No 0 0 1419 #
None 0 No #
set global sql_slave_skip_counter=1;
start slave;
set sql_log_bin=0;
...
...
@@ -54,7 +54,7 @@ stop slave;
reset 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
# 127.0.0.1 root MASTER_PORT 1 4
slave-relay-bin.000001 4 No No 0 0 0 4
None 0 No #
# 127.0.0.1 root MASTER_PORT 1 4
# # No No 0 0 0 #
None 0 No #
reset master;
create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60),
unique(day));
...
...
mysql-test/r/rpl_log.result
View file @
b11dee73
...
...
@@ -96,7 +96,7 @@ slave-bin.000002 62 Query 1 62 use `test`; insert into t1 values (1)
slave-bin.000002 122 Query 1 122 use `test`; drop table t1
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.000002 276
slave-relay-bin.000003 214 master-bin.000002 Yes Yes 0 0 276 214
None 0 No #
# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 276
# # master-bin.000002 Yes Yes 0 0 276 #
None 0 No #
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
create table t1(a int auto_increment primary key, b int);
...
...
mysql-test/r/rpl_max_relay_size.result
View file @
b11dee73
...
...
@@ -28,8 +28,8 @@ Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos 50477
Relay_Log_File
slave-relay-bin.000014
Relay_Log_Pos
1221
Relay_Log_File
#
Relay_Log_Pos
#
Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes
Slave_SQL_Running Yes
...
...
@@ -43,7 +43,7 @@ Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos 50477
Relay_Log_Space
1221
Relay_Log_Space
#
Until_Condition None
Until_Log_File
Until_Log_Pos 0
...
...
@@ -71,8 +71,8 @@ Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos 50477
Relay_Log_File
slave-relay-bin.000004
Relay_Log_Pos
9457
Relay_Log_File
#
Relay_Log_Pos
#
Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes
Slave_SQL_Running Yes
...
...
@@ -86,7 +86,7 @@ Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos 50477
Relay_Log_Space
9457
Relay_Log_Space
#
Until_Condition None
Until_Log_File
Until_Log_Pos 0
...
...
@@ -114,8 +114,8 @@ Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos 50477
Relay_Log_File
slave-relay-bin.000008
Relay_Log_Pos
1283
Relay_Log_File
#
Relay_Log_Pos
#
Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes
Slave_SQL_Running Yes
...
...
@@ -129,7 +129,7 @@ Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos 50477
Relay_Log_Space
1283
Relay_Log_Space
#
Until_Condition None
Until_Log_File
Until_Log_Pos 0
...
...
@@ -154,8 +154,8 @@ Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File
Read_Master_Log_Pos 4
Relay_Log_File
slave-relay-bin.000001
Relay_Log_Pos
4
Relay_Log_File
#
Relay_Log_Pos
#
Relay_Master_Log_File
Slave_IO_Running No
Slave_SQL_Running No
...
...
@@ -169,7 +169,7 @@ Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos 0
Relay_Log_Space
4
Relay_Log_Space
#
Until_Condition None
Until_Log_File
Until_Log_Pos 0
...
...
@@ -195,8 +195,8 @@ Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos 50535
Relay_Log_File
slave-relay-bin.000009
Relay_Log_Pos
62
Relay_Log_File
#
Relay_Log_Pos
#
Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes
Slave_SQL_Running Yes
...
...
@@ -210,7 +210,7 @@ Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos 50535
Relay_Log_Space
62
Relay_Log_Space
#
Until_Condition None
Until_Log_File
Until_Log_Pos 0
...
...
@@ -234,8 +234,8 @@ Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos 50583
Relay_Log_File
slave-relay-bin.000010
Relay_Log_Pos
52
Relay_Log_File
#
Relay_Log_Pos
#
Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes
Slave_SQL_Running Yes
...
...
@@ -249,7 +249,7 @@ Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos 50583
Relay_Log_Space
52
Relay_Log_Space
#
Until_Condition None
Until_Log_File
Until_Log_Pos 0
...
...
mysql-test/r/rpl_replicate_do.result
View file @
b11dee73
...
...
@@ -28,7 +28,7 @@ ERROR 42S02: Table 'test.t11' doesn't exist
drop table if exists t1,t2,t11;
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 1340
slave-relay-bin.000002 1384 master-bin.000001 Yes Yes test.t1 0 0 1340 1384
None 0 No #
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1340
# # master-bin.000001 Yes Yes test.t1 0 0 1340 #
None 0 No #
create table t1 (ts timestamp);
set one_shot time_zone='met';
insert into t1 values('2005-08-12 00:00:00');
...
...
mysql-test/t/lowercase_table3.test
View file @
b11dee73
...
...
@@ -5,12 +5,8 @@
#
--
source
include
/
have_innodb
.
inc
--
require
r
/
lowercase0
.
require
disable_query_log
;
show
variables
like
"lower_case_%"
;
--
require
r
/
true
.
require
select
convert
(
@@
version_compile_os
using
latin1
)
NOT
IN
(
"NT"
,
"WIN2000"
,
"Win95/Win98"
,
"XP"
)
as
"TRUE"
;
enable_query_log
;
--
source
include
/
have_lowercase0
.
inc
--
source
include
/
not_windows
.
inc
--
disable_warnings
DROP
TABLE
IF
EXISTS
t1
,
T1
;
...
...
mysql-test/t/mysql_protocols.test
View file @
b11dee73
# Embedded server doesn't support external clients
--
source
include
/
not_embedded
.
inc
# Windows does not have SOCKET, but will try to create a PIPE as well as MEMORY
--
source
include
/
not_windows
.
inc
# test for Bug #4998 "--protocol doesn't reject bad values"
...
...
mysql-test/t/rpl000015.test
View file @
b11dee73
...
...
@@ -7,24 +7,24 @@ save_master_pos;
connection
slave
;
reset
slave
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
show
slave
status
;
change
master
to
master_host
=
'127.0.0.1'
;
# The following needs to be cleaned up when change master is fixed
--
replace_result
$MASTER_MYPORT
MASTER_PORT
$MYSQL_TCP_PORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
show
slave
status
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
eval
change
master
to
master_host
=
'127.0.0.1'
,
master_user
=
'root'
,
master_password
=
''
,
master_port
=
$MASTER_MYPORT
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
show
slave
status
;
start
slave
;
sync_with_master
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
show
slave
status
;
connection
master
;
--
disable_warnings
...
...
mysql-test/t/rpl_change_master.test
View file @
b11dee73
...
...
@@ -12,11 +12,12 @@ connection slave;
stop
slave
;
select
*
from
t1
;
--
replace_result
$MASTER_MYPORT
MASTER_MYPORT
--
replace_column
1
# 8 # 9 # 23 # 33 #
--
replace_column
1
# 33 #
show
slave
status
;
change
master
to
master_user
=
'root'
;
--
replace_result
$MASTER_MYPORT
MASTER_MYPORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
show
slave
status
;
# Will restart from after the values(2), which is bug
select
release_lock
(
"a"
);
...
...
mysql-test/t/rpl_drop_db.test
View file @
b11dee73
...
...
@@ -13,6 +13,7 @@ insert into mysqltest1.t1 values (1);
select
*
from
mysqltest1
.
t1
into
outfile
'mysqltest1/f1.txt'
;
create
table
mysqltest1
.
t2
(
n
int
);
create
table
mysqltest1
.
t3
(
n
int
);
--
replace_result
\\
/
--
error
1010
drop
database
mysqltest1
;
use
mysqltest1
;
...
...
@@ -29,6 +30,7 @@ while ($1)
}
--
enable_query_log
--
replace_result
\\
/
--
error
1010
drop
database
mysqltest1
;
use
mysqltest1
;
...
...
mysql-test/t/rpl_error_ignored_table.test
View file @
b11dee73
...
...
@@ -15,7 +15,7 @@ sync_with_master;
# The port number is different when doing the release build with
# Do-compile, hence we have to replace the port number here accordingly
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
show
slave
status
;
# check that the table has been ignored, because otherwise the test is nonsense
show
tables
like
't1'
;
...
...
mysql-test/t/rpl_loaddata.test
View file @
b11dee73
...
...
@@ -72,7 +72,7 @@ set global sql_slave_skip_counter=1;
start
slave
;
sync_with_master
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
show
slave
status
;
# Trigger error again to test CHANGE MASTER
...
...
@@ -92,7 +92,7 @@ stop slave;
change
master
to
master_user
=
'test'
;
change
master
to
master_user
=
'root'
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
show
slave
status
;
# Trigger error again to test RESET SLAVE
...
...
@@ -114,7 +114,7 @@ wait_for_slave_to_stop;
stop
slave
;
reset
slave
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
show
slave
status
;
# Finally, see if logging is done ok on master for a failing LOAD DATA INFILE
...
...
mysql-test/t/rpl_log-master.opt
View file @
b11dee73
--
skip-external-locking
--
force-restart
mysql-test/t/rpl_log.test
View file @
b11dee73
...
...
@@ -94,7 +94,7 @@ show binlog events in 'slave-bin.000001' from 4;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
$VERSION
VERSION
show
binlog
events
in
'slave-bin.000002'
from
4
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
show
slave
status
;
# Need to recode the following
...
...
mysql-test/t/rpl_max_relay_size.test
View file @
b11dee73
...
...
@@ -38,7 +38,7 @@ select @@global.max_relay_log_size;
start
slave
;
sync_with_master
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
--
vertical_results
show
slave
status
;
...
...
@@ -53,7 +53,7 @@ select @@global.max_relay_log_size;
start
slave
;
sync_with_master
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
--
vertical_results
show
slave
status
;
...
...
@@ -68,7 +68,7 @@ select @@global.max_relay_log_size;
start
slave
;
sync_with_master
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
--
vertical_results
show
slave
status
;
...
...
@@ -82,7 +82,7 @@ reset slave;
# (to make sure it does not crash).
flush
logs
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
--
vertical_results
show
slave
status
;
...
...
@@ -103,7 +103,7 @@ save_master_pos;
connection
slave
;
sync_with_master
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
--
vertical_results
show
slave
status
;
...
...
@@ -118,7 +118,7 @@ save_master_pos;
connection
slave
;
sync_with_master
;
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
--
vertical_results
show
slave
status
;
...
...
mysql-test/t/rpl_replicate_do.test
View file @
b11dee73
...
...
@@ -33,7 +33,7 @@ connection slave;
sync_with_master
;
# show slave status, just to see of it prints replicate-do-table
--
replace_result
$MASTER_MYPORT
MASTER_PORT
--
replace_column
1
# 33 #
--
replace_column
1
#
8 # 9 # 23 #
33 #
show
slave
status
;
#
...
...
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