Skip to content

Commit 13923bf

Browse files
author
Mats Kindahl
committed
Merging with mysql-5.1-rep+2
--BZR-- revision-id: [email protected] property-branch-nick: w5151-mysql-5.1-rep+2 testament3-sha1: a3dc80e44dd3b367fd53ce8a6c51adac9bb746af
2 parents 05cdadb + ec74661 commit 13923bf

45 files changed

Lines changed: 2977 additions & 485 deletions

Some content is hidden

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

‎.bzrfileids‎

694 Bytes
Binary file not shown.

‎.bzrignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ client/rpl_record_old.h
392392
client/rpl_tblmap.h
393393
client/rpl_tblmap.cc
394394
client/rpl_utility.h
395+
client/rpl_utility.cc
395396
client/select_test
396397
client/sql_string.cpp
397398
client/ssl_test
@@ -1142,6 +1143,7 @@ libmysqld/rpl_filter.cc
11421143
libmysqld/rpl_injector.cc
11431144
libmysqld/rpl_record.cc
11441145
libmysqld/rpl_record_old.cc
1146+
libmysqld/rpl_utility.cc
11451147
libmysqld/scheduler.cc
11461148
libmysqld/set_var.cc
11471149
libmysqld/simple-test

‎client/Makefile.am‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,10 @@ DEFS = -DMYSQL_CLIENT_NO_THREADS \
104104
-DMYSQL_DATADIR="\"$(localstatedir)\""
105105

106106
sql_src=log_event.h mysql_priv.h rpl_constants.h \
107-
rpl_utility.h rpl_tblmap.h rpl_tblmap.cc \
107+
rpl_tblmap.h rpl_tblmap.cc \
108108
log_event.cc my_decimal.h my_decimal.cc \
109109
log_event_old.h log_event_old.cc \
110+
rpl_utility.h rpl_utility.cc \
110111
rpl_record_old.h rpl_record_old.cc
111112
strings_src=decimal.c
112113

‎client/mysqlbinlog.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2139,4 +2139,4 @@ int main(int argc, char** argv)
21392139
#include "my_decimal.cc"
21402140
#include "log_event.cc"
21412141
#include "log_event_old.cc"
2142-
2142+
#include "rpl_utility.cc"

‎libmysqld/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
5555
item_geofunc.cc item_subselect.cc item_row.cc\
5656
item_xmlfunc.cc \
5757
key.cc lock.cc log.cc sql_state.c \
58-
log_event.cc rpl_record.cc \
58+
log_event.cc rpl_record.cc rpl_utility.cc \
5959
log_event_old.cc rpl_record_old.cc \
6060
protocol.cc net_serv.cc opt_range.cc \
6161
opt_sum.cc procedure.cc records.cc sql_acl.cc \

‎mysql-test/extra/rpl_tests/check_type.inc‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Helper file to perform one insert of a value into a table with
2+
# different types on master and slave. The file will insert the
3+
# result into the type_conversions table *on the slave* to get a
4+
# summary of failing and succeeding tests.
5+
6+
# Input:
7+
# $source_type Type on the master
8+
# $target_type Type on the slave
9+
# $source_value Value on the master (inserted into the table)
10+
# $target_value Value on the slave (expected value in the table
11+
# on the slave)
12+
# $can_convert True if conversion shall work, false if it
13+
# shall generate an error
14+
15+
16+
connection master;
17+
disable_warnings;
18+
DROP TABLE IF EXISTS t1;
19+
enable_warnings;
20+
eval CREATE TABLE t1 (a $source_type);
21+
sync_slave_with_master;
22+
eval ALTER TABLE t1 MODIFY a $target_type;
23+
24+
connection master;
25+
eval INSERT INTO t1 VALUES($source_value);
26+
if ($can_convert) {
27+
sync_slave_with_master;
28+
eval SELECT a = $target_value into @compare FROM t1;
29+
eval INSERT INTO type_conversions SET
30+
Source = "$source_type",
31+
Target = "$target_type",
32+
Flags = @@slave_type_conversions,
33+
On_Master = $source_value,
34+
Expected = $target_value,
35+
Compare = @compare;
36+
UPDATE type_conversions
37+
SET On_Slave = (SELECT a FROM t1)
38+
WHERE TestNo = LAST_INSERT_ID();
39+
}
40+
if (!$can_convert) {
41+
connection slave;
42+
wait_for_slave_to_stop;
43+
let $error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
44+
eval INSERT INTO type_conversions SET
45+
Source = "$source_type",
46+
Target = "$target_type",
47+
Flags = @@slave_type_conversions,
48+
On_Master = $source_value,
49+
Error = "$error";
50+
SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1;
51+
START SLAVE;
52+
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ sync_slave_with_master;
3636
STOP SLAVE;
3737
RESET SLAVE;
3838

39+
SET @saved_slave_type_conversions = @@slave_type_conversions;
40+
SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY';
41+
3942
eval CREATE TABLE t1 (a INT, b INT PRIMARY KEY, c CHAR(20),
4043
d FLOAT DEFAULT '2.00',
4144
e CHAR(4) DEFAULT 'TEST')
@@ -62,6 +65,8 @@ SELECT * FROM t1 ORDER BY a;
6265
sync_slave_with_master;
6366
SELECT * FROM t1 ORDER BY a;
6467

68+
SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
69+
6570
--echo *** Drop t1 ***
6671
connection master;
6772
DROP TABLE t1;
@@ -515,7 +520,7 @@ sync_slave_with_master;
515520
--echo *** Create t11 on slave ***
516521
STOP SLAVE;
517522
RESET SLAVE;
518-
eval CREATE TABLE t11 (a INT KEY, b BLOB, f TEXT,
523+
eval CREATE TABLE t11 (a INT KEY, b BLOB, f INT,
519524
c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE=$engine_type;
520525

521526
--echo *** Create t11 on Master ***

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

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# First we test tables with only an index.
77
#
88

9+
connection master;
910
eval CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)$extra_index_t1) ENGINE = $type ;
1011
SELECT * FROM t1;
1112
sync_slave_with_master;
@@ -156,6 +157,12 @@ SELECT * FROM t5,t2,t3 WHERE t5.C2='Q' AND t2.c12='R' AND t3.C3 ='S' ORDER BY t5
156157
# Testing special column types
157158
#
158159

160+
if (`select char_length('$bit_field_special') > 0`) {
161+
SET @saved_slave_type_conversions = @@SLAVE_TYPE_CONVERSIONS;
162+
connection slave;
163+
eval SET GLOBAL SLAVE_TYPE_CONVERSIONS = '$bit_field_special';
164+
}
165+
159166
connection master;
160167
eval CREATE TABLE t4 (C1 CHAR(1) PRIMARY KEY, B1 BIT(1), B2 BIT(1) NOT NULL DEFAULT 0, C2 CHAR(1) NOT NULL DEFAULT 'A') ENGINE = $type ;
161168

@@ -164,6 +171,10 @@ SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
164171
sync_slave_with_master;
165172
SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
166173

174+
if (`select char_length('$bit_field_special') > 0`) {
175+
SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
176+
}
177+
167178
#
168179
# Testing conflicting operations
169180
#
@@ -350,6 +361,10 @@ eval CREATE TABLE t7 (i INT NOT NULL,
350361
c CHAR(255) CHARACTER SET utf8 NOT NULL,
351362
j INT NOT NULL) ENGINE = $type ;
352363

364+
connection slave;
365+
SET @saved_slave_type_conversions = @@slave_type_conversions;
366+
SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY';
367+
353368
--echo [expecting slave to replicate correctly]
354369
connection master;
355370
INSERT INTO t1 VALUES (1, "", 1);
@@ -370,17 +385,9 @@ let $diff_table_1=master:test.t2;
370385
let $diff_table_2=slave:test.t2;
371386
source include/diff_tables.inc;
372387

373-
--echo [expecting slave to stop]
374-
connection master;
375-
INSERT INTO t3 VALUES (1, "", 1);
376-
INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
377-
378388
connection slave;
379-
source include/wait_for_slave_sql_to_stop.inc;
380-
let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
381-
disable_query_log;
382-
eval SELECT "$last_error" AS Last_SQL_Error;
383-
enable_query_log;
389+
SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
390+
384391
connection master;
385392
RESET MASTER;
386393
connection slave;
@@ -600,7 +607,15 @@ sync_slave_with_master;
600607

601608
connection master;
602609

610+
# Since t1 contain a bit field, we have to do this trick to handle InnoDB
611+
if (`select char_length('$bit_field_special') > 0`) {
612+
SET @saved_slave_type_conversions = @@SLAVE_TYPE_CONVERSIONS;
613+
connection slave;
614+
eval SET GLOBAL SLAVE_TYPE_CONVERSIONS = '$bit_field_special';
615+
}
616+
603617
--disable_warnings
618+
connection master;
604619
eval CREATE TABLE t1 (a bit) ENGINE=$type;
605620
INSERT IGNORE INTO t1 VALUES (NULL);
606621
INSERT INTO t1 ( a ) VALUES ( 0 );
@@ -645,6 +660,10 @@ UPDATE t1 SET a = 9 WHERE a < 5 LIMIT 3;
645660

646661
sync_slave_with_master;
647662

663+
if (`select char_length('$bit_field_special') > 0`) {
664+
SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
665+
}
666+
648667
let $diff_table_1=master:test.t1;
649668
let $diff_table_2=slave:test.t1;
650669
source include/diff_tables.inc;

0 commit comments

Comments
 (0)