Skip to content

Commit e37c86d

Browse files
author
Sven Sandberg
committed
Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.
2 parents 7d5df40 + 09c80e1 commit e37c86d

File tree

831 files changed

+7921
-6319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

831 files changed

+7921
-6319
lines changed

‎client/mysqltest.cc

+64-14
Original file line numberDiff line numberDiff line change
@@ -8284,6 +8284,14 @@ int main(int argc, char **argv)
82848284
var_set_int("$VIEW_PROTOCOL", view_protocol);
82858285
var_set_int("$CURSOR_PROTOCOL", cursor_protocol);
82868286

8287+
var_set_int("$ENABLED_QUERY_LOG", 1);
8288+
var_set_int("$ENABLED_ABORT_ON_ERROR", 1);
8289+
var_set_int("$ENABLED_RESULT_LOG", 1);
8290+
var_set_int("$ENABLED_CONNECT_LOG", 0);
8291+
var_set_int("$ENABLED_WARNINGS", 1);
8292+
var_set_int("$ENABLED_INFO", 0);
8293+
var_set_int("$ENABLED_METADATA", 0);
8294+
82878295
DBUG_PRINT("info",("result_file: '%s'",
82888296
result_file_name ? result_file_name : ""));
82898297
verbose_msg("Results saved in '%s'.",
@@ -8430,20 +8438,62 @@ int main(int argc, char **argv)
84308438
case Q_DISCONNECT:
84318439
case Q_DIRTY_CLOSE:
84328440
do_close_connection(command); break;
8433-
case Q_ENABLE_QUERY_LOG: disable_query_log=0; break;
8434-
case Q_DISABLE_QUERY_LOG: disable_query_log=1; break;
8435-
case Q_ENABLE_ABORT_ON_ERROR: abort_on_error=1; break;
8436-
case Q_DISABLE_ABORT_ON_ERROR: abort_on_error=0; break;
8437-
case Q_ENABLE_RESULT_LOG: disable_result_log=0; break;
8438-
case Q_DISABLE_RESULT_LOG: disable_result_log=1; break;
8439-
case Q_ENABLE_CONNECT_LOG: disable_connect_log=0; break;
8440-
case Q_DISABLE_CONNECT_LOG: disable_connect_log=1; break;
8441-
case Q_ENABLE_WARNINGS: disable_warnings=0; break;
8442-
case Q_DISABLE_WARNINGS: disable_warnings=1; break;
8443-
case Q_ENABLE_INFO: disable_info=0; break;
8444-
case Q_DISABLE_INFO: disable_info=1; break;
8445-
case Q_ENABLE_METADATA: display_metadata=1; break;
8446-
case Q_DISABLE_METADATA: display_metadata=0; break;
8441+
case Q_ENABLE_QUERY_LOG:
8442+
disable_query_log= 0;
8443+
var_set_int("$ENABLED_QUERY_LOG", 1);
8444+
break;
8445+
case Q_DISABLE_QUERY_LOG:
8446+
disable_query_log= 1;
8447+
var_set_int("$ENABLED_QUERY_LOG", 0);
8448+
break;
8449+
case Q_ENABLE_ABORT_ON_ERROR:
8450+
abort_on_error= 1;
8451+
var_set_int("$ENABLED_ABORT_ON_ERROR", 1);
8452+
break;
8453+
case Q_DISABLE_ABORT_ON_ERROR:
8454+
abort_on_error= 0;
8455+
var_set_int("$ENABLED_ABORT_ON_ERROR", 0);
8456+
break;
8457+
case Q_ENABLE_RESULT_LOG:
8458+
disable_result_log= 0;
8459+
var_set_int("$ENABLED_RESULT_LOG", 1);
8460+
break;
8461+
case Q_DISABLE_RESULT_LOG:
8462+
disable_result_log=1;
8463+
var_set_int("$ENABLED_RESULT_LOG", 0);
8464+
break;
8465+
case Q_ENABLE_CONNECT_LOG:
8466+
disable_connect_log=0;
8467+
var_set_int("$ENABLED_CONNECT_LOG", 1);
8468+
break;
8469+
case Q_DISABLE_CONNECT_LOG:
8470+
disable_connect_log=1;
8471+
var_set_int("$ENABLED_CONNECT_LOG", 0);
8472+
break;
8473+
case Q_ENABLE_WARNINGS:
8474+
disable_warnings= 0;
8475+
var_set_int("$ENABLED_WARNINGS", 1);
8476+
break;
8477+
case Q_DISABLE_WARNINGS:
8478+
disable_warnings= 1;
8479+
var_set_int("$ENABLED_WARNINGS", 0);
8480+
break;
8481+
case Q_ENABLE_INFO:
8482+
disable_info= 0;
8483+
var_set_int("$ENABLED_INFO", 1);
8484+
break;
8485+
case Q_DISABLE_INFO:
8486+
disable_info= 1;
8487+
var_set_int("$ENABLED_INFO", 0);
8488+
break;
8489+
case Q_ENABLE_METADATA:
8490+
display_metadata= 1;
8491+
var_set_int("$ENABLED_METADATA", 1);
8492+
break;
8493+
case Q_DISABLE_METADATA:
8494+
display_metadata= 0;
8495+
var_set_int("$ENABLED_METADATA", 0);
8496+
break;
84478497
case Q_SOURCE: do_source(command); break;
84488498
case Q_SLEEP: do_sleep(command, 0); break;
84498499
case Q_REAL_SLEEP: do_sleep(command, 1); break;

‎mysql-test/extra/rpl_tests/rpl_EE_err.test

+1-8
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
# check if START SLAVE, RESET SLAVE, CHANGE MASTER reset Last_slave_error and
1010
# Last_slave_errno in SHOW SLAVE STATUS (1st and 3rd commands did not: bug 986).
1111
####################################
12-
# Change Author: JBM
13-
# Change Date: 2006-01-11
14-
# Change: Split test per lars review
15-
####################################
1612
#"REQUIREMENT: A master DROP TABLE on a table with non-existing MYI
1713
# file must be correctly replicated to the slave"
1814
####################################
@@ -23,8 +19,5 @@ flush tables;
2319
let $MYSQLD_DATADIR= `select @@datadir`;
2420
remove_file $MYSQLD_DATADIR/test/t1.MYI ;
2521
drop table if exists t1;
26-
save_master_pos;
27-
connection slave;
28-
sync_with_master;
2922

30-
# End of 4.1 tests
23+
--source include/rpl_end.inc

‎mysql-test/extra/rpl_tests/rpl_auto_increment.test

+8-18
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
#
22
# Test of auto_increment with offset
33
#
4-
#####################################
5-
# By: JBM
6-
# Date: 2006-02-10
7-
# Change: NDB does not support auto inc
8-
# in this usage. Currently there is no
9-
# plan to implment. Skipping test when
10-
# NDB is default engine.
11-
#####################################
124
-- source include/not_ndb_default.inc
135
-- source include/master-slave.inc
146

@@ -169,7 +161,7 @@ drop table t1;
169161
# auto_increment fields if the values of them are 0. There is an inconsistency
170162
# between slave and master. When MODE_NO_AUTO_VALUE_ON_ZERO are masters treat
171163
#
172-
source include/master-slave-reset.inc;
164+
source include/rpl_reset.inc;
173165

174166
connection master;
175167
--disable_warnings
@@ -210,12 +202,10 @@ INSERT INTO t2 VALUES(4);
210202
FLUSH LOGS;
211203
sync_slave_with_master;
212204

213-
let $diff_table_1= master:test.t1;
214-
let $diff_table_2= slave:test.t1;
205+
let $diff_tables= master:t1, slave:t1;
215206
source include/diff_tables.inc;
216207

217-
let $diff_table_1= master:test.t2;
218-
let $diff_table_2= slave:test.t2;
208+
let $diff_tables= master:t2, slave:t2;
219209
source include/diff_tables.inc;
220210

221211
connection master;
@@ -228,16 +218,16 @@ let $MYSQLD_DATADIR= `SELECT @@DATADIR`;
228218
--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 | $MYSQL test
229219
sync_slave_with_master;
230220

231-
let $diff_table_1= master:test.t1;
232-
let $diff_table_2= slave:test.t1;
221+
let $diff_tables= master:t1, slave:t1;
233222
source include/diff_tables.inc;
234223

235-
let $diff_table_1= master:test.t2;
236-
let $diff_table_2= slave:test.t2;
224+
let $diff_tables= master:t2, slave:t2;
237225
source include/diff_tables.inc;
238226

239227
# End cleanup
228+
--connection master
240229
DROP TABLE t1;
241230
DROP TABLE t2;
242231
SET SQL_MODE='';
243-
sync_slave_with_master;
232+
233+
--source include/rpl_end.inc

‎mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ commit;
2929
sync_slave_with_master;
3030
--echo #Test if the results are consistent on master and slave
3131
--echo #for 'INSERT DATA INTO VIEW WHICH INVOKES TRIGGERS'
32-
let $diff_table_1=master:test.t3;
33-
let $diff_table_2=slave:test.t3;
32+
let $diff_tables= master:t3, slave:t3;
3433
source include/diff_tables.inc;
3534

3635
connection master;

‎mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test

+3-6
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,11 @@ connection master;
6060
sync_slave_with_master;
6161
--echo #Test if the results are consistent on master and slave
6262
--echo #for 'INVOKES A TRIGGER with $trigger_action action'
63-
let $diff_table_1=master:test.t2;
64-
let $diff_table_2=slave:test.t2;
63+
let $diff_tables= master:t2, slave:t2;
6564
source include/diff_tables.inc;
66-
let $diff_table_1=master:test.t4;
67-
let $diff_table_2=slave:test.t4;
65+
let $diff_tables= master:t4, slave:t4;
6866
source include/diff_tables.inc;
69-
let $diff_table_1=master:test.t6;
70-
let $diff_table_2=slave:test.t6;
67+
let $diff_tables= master:t6, slave:t6;
7168
source include/diff_tables.inc;
7269

7370
connection master;

‎mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test

+2-4
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,9 @@ connection master;
4141
sync_slave_with_master;
4242
--echo #Test if the results are consistent on master and slave
4343
--echo #for 'CALLS A FUNCTION which INVOKES A TRIGGER with $insert_action action'
44-
let $diff_table_1=master:test.t2;
45-
let $diff_table_2=slave:test.t2;
44+
let $diff_tables= master:t2, slave:t2;
4645
source include/diff_tables.inc;
47-
let $diff_table_1=master:test.t3;
48-
let $diff_table_2=slave:test.t3;
46+
let $diff_tables= master:t3, slave:t3;
4947
source include/diff_tables.inc;
5048

5149
connection master;

‎mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test

+32-25
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ eval INSERT INTO t2 (a, data) VALUES (2,
6262
--enable_query_log
6363

6464
# Incident event
65-
--let $slave_sql_errno=1590
65+
# 1590=ER_SLAVE_INCIDENT
66+
--let $slave_sql_errno= 1590
6667
--source include/wait_for_slave_sql_error_and_skip.inc
6768

6869
--disable_query_log
@@ -81,15 +82,13 @@ eval UPDATE t2, t1 SET t2.data = CONCAT($data, $data, $data, $data),
8182
t1.data = CONCAT($data, $data, $data, $data);
8283
--enable_query_log
8384

84-
# Incident event
85-
--let $slave_skip_counter=1
86-
if (`SELECT @@binlog_format = 'ROW'`)
87-
{
88-
--inc $slave_skip_counter
89-
}
90-
--let $slave_sql_errno=1590
85+
# 1590=ER_SLAVE_INCIDENT
86+
--let $slave_sql_errno= 1590
87+
--let $slave_skip_counter= `SELECT IF(@@binlog_format = 'ROW', 2, 1)`
9188
--source include/wait_for_slave_sql_error_and_skip.inc
92-
--let $slave_skip_counter=
89+
90+
--let $diff_tables= master:t1,slave:t1
91+
--source include/diff_tables.inc
9392

9493
--echo ########################################################################################
9594
--echo # 2 - BEGIN - IMPLICIT COMMIT by DDL
@@ -177,8 +176,9 @@ BEGIN;
177176
CREATE TABLE t5 (a int);
178177
--enable_query_log
179178

180-
let $diff_statement= SELECT * FROM t1;
181-
--source include/diff_master_slave.inc
179+
--sync_slave_with_master
180+
--let $diff_tables= master:t1,slave:t1
181+
--source include/diff_tables.inc
182182

183183
--echo ########################################################################################
184184
--echo # 3 - BEGIN - COMMIT
@@ -206,8 +206,9 @@ BEGIN;
206206
--enable_query_log
207207
COMMIT;
208208

209-
let $diff_statement= SELECT * FROM t1;
210-
--source include/diff_master_slave.inc
209+
--sync_slave_with_master
210+
--let $diff_tables= master:t1,slave:t1
211+
--source include/diff_tables.inc
211212

212213
--echo ########################################################################################
213214
--echo # 4 - BEGIN - ROLLBACK
@@ -235,8 +236,9 @@ BEGIN;
235236
--enable_query_log
236237
ROLLBACK;
237238

238-
let $diff_statement= SELECT * FROM t1;
239-
--source include/diff_master_slave.inc
239+
--sync_slave_with_master
240+
--let $diff_tables= master:t1,slave:t1
241+
--source include/diff_tables.inc
240242

241243
--echo ########################################################################################
242244
--echo # 5 - PROCEDURE
@@ -284,8 +286,9 @@ eval CALL p1($data);
284286
--enable_query_log
285287
ROLLBACK;
286288

287-
let $diff_statement= SELECT * FROM t1;
288-
--source include/diff_master_slave.inc
289+
--sync_slave_with_master
290+
--let $diff_tables= master:t1,slave:t1
291+
--source include/diff_tables.inc
289292

290293
--echo ########################################################################################
291294
--echo # 6 - XID
@@ -315,8 +318,9 @@ SAVEPOINT sv;
315318
ROLLBACK TO sv;
316319
COMMIT;
317320

318-
let $diff_statement= SELECT * FROM t1;
319-
--source include/diff_master_slave.inc
321+
--sync_slave_with_master
322+
--let $diff_tables= master:t1,slave:t1
323+
--source include/diff_tables.inc
320324

321325
--echo ########################################################################################
322326
--echo # 7 - NON-TRANS TABLE
@@ -358,8 +362,9 @@ BEGIN;
358362
--enable_query_log
359363
COMMIT;
360364

361-
let $diff_statement= SELECT * FROM t1;
362-
--source include/diff_master_slave.inc
365+
--sync_slave_with_master
366+
--let $diff_tables= master:t1,slave:t1
367+
--source include/diff_tables.inc
363368

364369
--echo ########################################################################
365370
--echo # 8 - Bug#55375(Regression Bug) Transaction bigger than
@@ -409,7 +414,7 @@ while ($n)
409414
--enable_query_log
410415
COMMIT;
411416

412-
connection slave;
417+
--connection slave
413418
--let $slave_sql_errno= 1197
414419
if (`SELECT @@binlog_format = 'ROW'`)
415420
{
@@ -444,8 +449,10 @@ connection master;
444449
DROP TABLE t1;
445450
DROP TABLE t2;
446451
DROP TABLE t3;
452+
# t4 exists only if binlog_format!=row, so so a warning is generated
453+
# if binog_format=row
454+
--disable_warnings
447455
DROP TABLE IF EXISTS t4;
448-
DROP TABLE IF EXISTS t5;
449-
DROP TABLE IF EXISTS t6;
456+
--enable_warnings
457+
DROP TABLE t5;
450458
DROP PROCEDURE p1;
451-
source include/master-slave-end.inc;

‎mysql-test/extra/rpl_tests/rpl_charset.test

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
# This test will fail if the server/client does not support enough charsets.
33

44
source include/master-slave.inc;
5-
--disable_warnings
65
set timestamp=1000000000;
7-
drop database if exists mysqltest2;
8-
drop database if exists mysqltest3;
9-
--enable_warnings
106

117
create database mysqltest2 character set latin2;
128
set @@character_set_server=latin5;
@@ -149,6 +145,6 @@ eval create table `t1` (
149145
set @p=_latin1 'test';
150146
update t1 set pk='test' where pk=@p;
151147
drop table t1;
152-
sync_slave_with_master;
153148

154149
# End of 4.1 tests
150+
--source include/rpl_end.inc

‎mysql-test/extra/rpl_tests/rpl_commit_after_flush.test

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
#################################
2-
# Test updated to use a wrapper #
3-
#################################
4-
51
eval CREATE TABLE t1 (a INT) ENGINE=$engine_type;
62

73
begin;
84
insert into t1 values(1);
95
flush tables with read lock;
106
commit;
11-
save_master_pos;
12-
connection slave;
13-
sync_with_master;
7+
sync_slave_with_master;
148
# cleanup
159
connection master;
1610
unlock tables;

0 commit comments

Comments
 (0)