Skip to content

Commit 3f607c4

Browse files
author
Mats Kindahl
committed
Merging with mysql-5.1-rep+2
2 parents f28ac80 + b524f27 commit 3f607c4

File tree

3 files changed

+45
-0
lines changed

3 files changed

+45
-0
lines changed

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,34 @@ let $target_value = 'master,slave';
7575
let $can_convert = 1;
7676
source extra/rpl_tests/check_type.inc;
7777

78+
let $source_type = SET('0','1','2','3','4','5','6');
79+
let $target_type = SET('0','1','2','3','4','5','6');
80+
let $source_value = '5';
81+
let $target_value = '5';
82+
let $can_convert = 1;
83+
source extra/rpl_tests/check_type.inc;
84+
85+
let $source_type = SET('0','1','2','3','4','5','6');
86+
let $target_type = SET('0','1','2','3','4','5','6','7','8','9','10');
87+
let $source_value = '5';
88+
let $target_value = '5';
89+
let $can_convert = $if_is_non_lossy;
90+
source extra/rpl_tests/check_type.inc;
91+
92+
let $source_type = SET('0','1','2','3','4','5','6','7','8','9','10');
93+
let $target_type = SET('0','1','2','3','4','5','6');
94+
let $source_value = '5';
95+
let $target_value = '5';
96+
let $can_convert = $if_is_lossy;
97+
source extra/rpl_tests/check_type.inc;
98+
99+
let $source_type = SET('0','1','2','3','4','5','6','7','8','9','10');
100+
let $target_type = SET('0','1','2','3','4','5','6');
101+
let $source_value = '7';
102+
let $target_value = '';
103+
let $can_convert = $if_is_lossy;
104+
source extra/rpl_tests/check_type.inc;
105+
78106
let $source_type = TINYINT;
79107
let $target_type = TINYINT;
80108
let $source_value = 1;

‎mysql-test/suite/rpl/r/rpl_typeconv.result

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ ENUM('master',' CHAR(10) <Correct error>
7878
SET('master','s CHAR(10) <Correct error>
7979
SET('master','s SET('master','s <Correct value>
8080
SET('master','s SET('master','s <Correct value>
81+
SET('0','1','2' SET('0','1','2' <Correct value>
82+
SET('0','1','2' SET('0','1','2' <Correct error>
83+
SET('0','1','2' SET('0','1','2' <Correct error>
84+
SET('0','1','2' SET('0','1','2' <Correct error>
8185
TINYINT TINYINT <Correct value>
8286
TINYINT SMALLINT <Correct error>
8387
TINYINT MEDIUMINT <Correct error>
@@ -176,6 +180,10 @@ ENUM('master',' CHAR(10) ALL_NON_LOSSY <Correct error>
176180
SET('master','s CHAR(10) ALL_NON_LOSSY <Correct error>
177181
SET('master','s SET('master','s ALL_NON_LOSSY <Correct value>
178182
SET('master','s SET('master','s ALL_NON_LOSSY <Correct value>
183+
SET('0','1','2' SET('0','1','2' ALL_NON_LOSSY <Correct value>
184+
SET('0','1','2' SET('0','1','2' ALL_NON_LOSSY <Correct value>
185+
SET('0','1','2' SET('0','1','2' ALL_NON_LOSSY <Correct error>
186+
SET('0','1','2' SET('0','1','2' ALL_NON_LOSSY <Correct error>
179187
TINYINT TINYINT ALL_NON_LOSSY <Correct value>
180188
TINYINT SMALLINT ALL_NON_LOSSY <Correct value>
181189
TINYINT MEDIUMINT ALL_NON_LOSSY <Correct value>
@@ -274,6 +282,10 @@ ENUM('master',' CHAR(10) ALL_LOSSY <Correct error>
274282
SET('master','s CHAR(10) ALL_LOSSY <Correct error>
275283
SET('master','s SET('master','s ALL_LOSSY <Correct value>
276284
SET('master','s SET('master','s ALL_LOSSY <Correct value>
285+
SET('0','1','2' SET('0','1','2' ALL_LOSSY <Correct value>
286+
SET('0','1','2' SET('0','1','2' ALL_LOSSY <Correct error>
287+
SET('0','1','2' SET('0','1','2' ALL_LOSSY <Correct value>
288+
SET('0','1','2' SET('0','1','2' ALL_LOSSY <Correct value>
277289
TINYINT TINYINT ALL_LOSSY <Correct value>
278290
TINYINT SMALLINT ALL_LOSSY <Correct error>
279291
TINYINT MEDIUMINT ALL_LOSSY <Correct error>
@@ -372,6 +384,10 @@ ENUM('master',' CHAR(10) ALL_LOSSY,ALL_NON_LOSSY <Correct error>
372384
SET('master','s CHAR(10) ALL_LOSSY,ALL_NON_LOSSY <Correct error>
373385
SET('master','s SET('master','s ALL_LOSSY,ALL_NON_LOSSY <Correct value>
374386
SET('master','s SET('master','s ALL_LOSSY,ALL_NON_LOSSY <Correct value>
387+
SET('0','1','2' SET('0','1','2' ALL_LOSSY,ALL_NON_LOSSY <Correct value>
388+
SET('0','1','2' SET('0','1','2' ALL_LOSSY,ALL_NON_LOSSY <Correct value>
389+
SET('0','1','2' SET('0','1','2' ALL_LOSSY,ALL_NON_LOSSY <Correct value>
390+
SET('0','1','2' SET('0','1','2' ALL_LOSSY,ALL_NON_LOSSY <Correct value>
375391
TINYINT TINYINT ALL_LOSSY,ALL_NON_LOSSY <Correct value>
376392
TINYINT SMALLINT ALL_LOSSY,ALL_NON_LOSSY <Correct value>
377393
TINYINT MEDIUMINT ALL_LOSSY,ALL_NON_LOSSY <Correct value>

‎sql/sql_select.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10479,6 +10479,7 @@ TABLE *create_virtual_tmp_table(THD *thd, List<Create_field> &field_list)
1047910479
share->blob_field= blob_field;
1048010480
share->fields= field_count;
1048110481
share->blob_ptr_size= portable_sizeof_char_ptr;
10482+
share->db_low_byte_first=1; // True for HEAP and MyISAM
1048210483
setup_tmp_table_column_bitmaps(table, bitmaps);
1048310484

1048410485
/* Create all fields and calculate the total length of record */

0 commit comments

Comments
 (0)