mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge mysql-5.1-rep+2 --> mysql-5.1-rep+2-delivery1

Browse source
This commit is contained in:
Alfranio Correia 2009-12-21 06:33:32 +00:00
commit 8342a400d9
3 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
mysql-test/extra/rpl_tests/type_conversions.test
View file

@ -75,6 +75,34 @@ let $target_value = 'master,slave';
let $can_convert = 1; let $can_convert = 1;
source extra/rpl_tests/check_type.inc; source extra/rpl_tests/check_type.inc;
let $source_type = SET('0','1','2','3','4','5','6');
let $target_type = SET('0','1','2','3','4','5','6');
let $source_value = '5';
let $target_value = '5';
let $can_convert = 1;
source extra/rpl_tests/check_type.inc;
let $source_type = SET('0','1','2','3','4','5','6');
let $target_type = SET('0','1','2','3','4','5','6','7','8','9','10');
let $source_value = '5';
let $target_value = '5';
let $can_convert = $if_is_non_lossy;
source extra/rpl_tests/check_type.inc;
let $source_type = SET('0','1','2','3','4','5','6','7','8','9','10');
let $target_type = SET('0','1','2','3','4','5','6');
let $source_value = '5';
let $target_value = '5';
let $can_convert = $if_is_lossy;
source extra/rpl_tests/check_type.inc;
let $source_type = SET('0','1','2','3','4','5','6','7','8','9','10');
let $target_type = SET('0','1','2','3','4','5','6');
let $source_value = '7';
let $target_value = '';
let $can_convert = $if_is_lossy;
source extra/rpl_tests/check_type.inc;
let $source_type = TINYINT; let $source_type = TINYINT;
let $target_type = TINYINT; let $target_type = TINYINT;
let $source_value = 1; let $source_value = 1;

16
mysql-test/suite/rpl/r/rpl_typeconv.result
View file

@ -78,6 +78,10 @@ ENUM('master',' CHAR(10) <Correct error>
SET('master','s CHAR(10) <Correct error> SET('master','s CHAR(10) <Correct error>
SET('master','s SET('master','s <Correct value> SET('master','s SET('master','s <Correct value>
SET('master','s SET('master','s <Correct value> SET('master','s SET('master','s <Correct value>
SET('0','1','2' SET('0','1','2' <Correct value>
SET('0','1','2' SET('0','1','2' <Correct error>
SET('0','1','2' SET('0','1','2' <Correct error>
SET('0','1','2' SET('0','1','2' <Correct error>
TINYINT TINYINT <Correct value> TINYINT TINYINT <Correct value>
TINYINT SMALLINT <Correct error> TINYINT SMALLINT <Correct error>
TINYINT MEDIUMINT <Correct error> TINYINT MEDIUMINT <Correct error>
@ -176,6 +180,10 @@ ENUM('master',' CHAR(10) ALL_NON_LOSSY <Correct error>
SET('master','s CHAR(10) ALL_NON_LOSSY <Correct error> SET('master','s CHAR(10) ALL_NON_LOSSY <Correct error>
SET('master','s SET('master','s ALL_NON_LOSSY <Correct value> SET('master','s SET('master','s ALL_NON_LOSSY <Correct value>
SET('master','s SET('master','s ALL_NON_LOSSY <Correct value> SET('master','s SET('master','s ALL_NON_LOSSY <Correct value>
SET('0','1','2' SET('0','1','2' ALL_NON_LOSSY <Correct value>
SET('0','1','2' SET('0','1','2' ALL_NON_LOSSY <Correct value>
SET('0','1','2' SET('0','1','2' ALL_NON_LOSSY <Correct error>
SET('0','1','2' SET('0','1','2' ALL_NON_LOSSY <Correct error>
TINYINT TINYINT ALL_NON_LOSSY <Correct value> TINYINT TINYINT ALL_NON_LOSSY <Correct value>
TINYINT SMALLINT ALL_NON_LOSSY <Correct value> TINYINT SMALLINT ALL_NON_LOSSY <Correct value>
TINYINT MEDIUMINT ALL_NON_LOSSY <Correct value> TINYINT MEDIUMINT ALL_NON_LOSSY <Correct value>
@ -274,6 +282,10 @@ ENUM('master',' CHAR(10) ALL_LOSSY <Correct error>
SET('master','s CHAR(10) ALL_LOSSY <Correct error> SET('master','s CHAR(10) ALL_LOSSY <Correct error>
SET('master','s SET('master','s ALL_LOSSY <Correct value> SET('master','s SET('master','s ALL_LOSSY <Correct value>
SET('master','s SET('master','s ALL_LOSSY <Correct value> SET('master','s SET('master','s ALL_LOSSY <Correct value>
SET('0','1','2' SET('0','1','2' ALL_LOSSY <Correct value>
SET('0','1','2' SET('0','1','2' ALL_LOSSY <Correct error>
SET('0','1','2' SET('0','1','2' ALL_LOSSY <Correct value>
SET('0','1','2' SET('0','1','2' ALL_LOSSY <Correct value>
TINYINT TINYINT ALL_LOSSY <Correct value> TINYINT TINYINT ALL_LOSSY <Correct value>
TINYINT SMALLINT ALL_LOSSY <Correct error> TINYINT SMALLINT ALL_LOSSY <Correct error>
TINYINT MEDIUMINT ALL_LOSSY <Correct error> TINYINT MEDIUMINT ALL_LOSSY <Correct error>
@ -372,6 +384,10 @@ ENUM('master',' CHAR(10) ALL_LOSSY,ALL_NON_LOSSY <Correct error>
SET('master','s CHAR(10) ALL_LOSSY,ALL_NON_LOSSY <Correct error> SET('master','s CHAR(10) ALL_LOSSY,ALL_NON_LOSSY <Correct error>
SET('master','s SET('master','s ALL_LOSSY,ALL_NON_LOSSY <Correct value> SET('master','s SET('master','s ALL_LOSSY,ALL_NON_LOSSY <Correct value>
SET('master','s SET('master','s ALL_LOSSY,ALL_NON_LOSSY <Correct value> SET('master','s SET('master','s ALL_LOSSY,ALL_NON_LOSSY <Correct value>
SET('0','1','2' SET('0','1','2' ALL_LOSSY,ALL_NON_LOSSY <Correct value>
SET('0','1','2' SET('0','1','2' ALL_LOSSY,ALL_NON_LOSSY <Correct value>
SET('0','1','2' SET('0','1','2' ALL_LOSSY,ALL_NON_LOSSY <Correct value>
SET('0','1','2' SET('0','1','2' ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYINT TINYINT ALL_LOSSY,ALL_NON_LOSSY <Correct value> TINYINT TINYINT ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYINT SMALLINT ALL_LOSSY,ALL_NON_LOSSY <Correct value> TINYINT SMALLINT ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYINT MEDIUMINT ALL_LOSSY,ALL_NON_LOSSY <Correct value> TINYINT MEDIUMINT ALL_LOSSY,ALL_NON_LOSSY <Correct value>

1
sql/sql_select.cc
View file

@ -10454,6 +10454,7 @@ TABLE *create_virtual_tmp_table(THD *thd, List<Create_field> &field_list)
share->blob_field= blob_field; share->blob_field= blob_field;
share->fields= field_count; share->fields= field_count;
share->blob_ptr_size= portable_sizeof_char_ptr; share->blob_ptr_size= portable_sizeof_char_ptr;
share->db_low_byte_first=1; // True for HEAP and MyISAM
setup_tmp_table_column_bitmaps(table, bitmaps); setup_tmp_table_column_bitmaps(table, bitmaps);
/* Create all fields and calculate the total length of record */ /* Create all fields and calculate the total length of record */