← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mysql-dfsg-5.1/lucid-security

« back to all changes in this revision

Viewing changes to mysql-test/extra/rpl_tests/rpl_conflicts.test

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 22:33:55 UTC
  • mto: (1.2.1) (37.1.1 lucid-security)
  • mto: This revision was merged to the branch mainline in revision 36.
  • Revision ID: package-import@ubuntu.com-20120222223355-ku1tb4r70osci6v2
Tags: upstream-5.1.61
Import upstream version 5.1.61

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/extra/rpl_tests/rpl_conflicts.test
93
93
  source include/wait_for_slave_sql_error.inc;
94
94
  let $err= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
95
95
  --echo Last_SQL_Error = $err (expected "duplicate key" error)
 
96
  call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.* Error_code: 1062");
96
97
  SELECT * FROM t1;
97
98
 
98
99
  --echo ---- Resolve the conflict on the slave and restart SQL thread ----
137
138
# replication continues.
138
139
if (`SELECT @@global.binlog_format = 'ROW' AND @@global.slave_exec_mode = 'STRICT'`) {
139
140
  --echo ---- Wait until slave stops with an error ----
 
141
  call mtr.add_suppression("Can.t find record in .t1., Error_code: 1032");
140
142
  let $slave_sql_errno= 1032; # ER_KEY_NOT_FOUND
141
143
  source include/wait_for_slave_sql_error.inc;
142
 
  let $err= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
143
 
  --echo Last_SQL_Error = $err (expected "can't find record" error)
 
144
 
 
145
  --let $err= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1)
 
146
  --replace_regex /end_log_pos [0-9]+/end_log_pos END_LOG_POS/
 
147
  --disable_query_log
 
148
  --eval SELECT "$err" as 'Last_SQL_Error (expected "duplicate key" error)'
 
149
  --enable_query_log
 
150
 
144
151
  SELECT * FROM t1;
145
152
 
146
153
  --echo ---- Resolve the conflict on the slave and restart SQL thread ----
165
172
DROP TABLE t1;
166
173
 
167
174
--echo [on slave]
168
 
sync_slave_with_master;
 
175
--sync_slave_with_master