Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
9e9ea4f6
Commit
9e9ea4f6
authored
Apr 10, 2018
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-15821 Row format replication from LONGBLOB COMPRESSED to LONGBLOB does not work
parent
9bd3af97
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
375 additions
and
10 deletions
+375
-10
mysql-test/suite/binlog_encryption/rpl_typeconv.result
mysql-test/suite/binlog_encryption/rpl_typeconv.result
+99
-3
mysql-test/suite/rpl/include/rpl_typeconv.inc
mysql-test/suite/rpl/include/rpl_typeconv.inc
+3
-3
mysql-test/suite/rpl/include/type_conversions.test
mysql-test/suite/rpl/include/type_conversions.test
+170
-0
mysql-test/suite/rpl/r/rpl_typeconv.result
mysql-test/suite/rpl/r/rpl_typeconv.result
+99
-3
sql/sql_type.cc
sql/sql_type.cc
+4
-1
No files found.
mysql-test/suite/binlog_encryption/rpl_typeconv.result
View file @
9e9ea4f6
...
...
@@ -7,9 +7,9 @@ TestNo INT AUTO_INCREMENT PRIMARY KEY,
Source TEXT,
Target TEXT,
Flags TEXT,
On_Master TEXT,
On_Slave TEXT,
Expected TEXT,
On_Master
LONG
TEXT,
On_Slave
LONG
TEXT,
Expected
LONG
TEXT,
Compare INT,
Error TEXT);
SELECT @@global.slave_type_conversions;
...
...
@@ -39,18 +39,34 @@ ALL_LOSSY,ALL_NON_LOSSY
connection slave;
SET GLOBAL SLAVE_TYPE_CONVERSIONS='';
**** Running tests with @@SLAVE_TYPE_CONVERSIONS = '' ****
#
# MDEV-15821 Row format replication from LONGBLOB COMPRESSED to LONGBLOB does not work
#
# End of MDEV-15833
include/rpl_reset.inc
connection slave;
SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_NON_LOSSY';
**** Running tests with @@SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY' ****
#
# MDEV-15821 Row format replication from LONGBLOB COMPRESSED to LONGBLOB does not work
#
# End of MDEV-15833
include/rpl_reset.inc
connection slave;
SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY';
**** Running tests with @@SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY' ****
#
# MDEV-15821 Row format replication from LONGBLOB COMPRESSED to LONGBLOB does not work
#
# End of MDEV-15833
include/rpl_reset.inc
connection slave;
SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY';
**** Running tests with @@SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY,ALL_NON_LOSSY' ****
#
# MDEV-15821 Row format replication from LONGBLOB COMPRESSED to LONGBLOB does not work
#
# End of MDEV-15833
include/rpl_reset.inc
connection slave;
**** Result of conversions ****
...
...
@@ -176,6 +192,26 @@ BIT(5) BIT(6) <Correct error>
BIT(6) BIT(5) <Correct error>
BIT(5) BIT(12) <Correct error>
BIT(12) BIT(5) <Correct error>
TINYBLOB COMPRE TINYBLOB <Correct error>
TINYBLOB COMPRE BLOB <Correct error>
TINYBLOB COMPRE MEDIUMBLOB <Correct error>
TINYBLOB COMPRE LONGBLOB <Correct error>
TINYBLOB COMPRE VARBINARY(255) <Correct error>
BLOB COMPRESSED TINYBLOB <Correct error>
BLOB COMPRESSED BLOB <Correct error>
BLOB COMPRESSED MEDIUMBLOB <Correct error>
BLOB COMPRESSED LONGBLOB <Correct error>
BLOB COMPRESSED VARBINARY(65500 <Correct error>
MEDIUMBLOB COMP TINYBLOB <Correct error>
MEDIUMBLOB COMP BLOB <Correct error>
MEDIUMBLOB COMP MEDIUMBLOB <Correct error>
MEDIUMBLOB COMP LONGBLOB <Correct error>
MEDIUMBLOB COMP VARBINARY(65500 <Correct error>
LONGBLOB COMPRE TINYBLOB <Correct error>
LONGBLOB COMPRE BLOB <Correct error>
LONGBLOB COMPRE MEDIUMBLOB <Correct error>
LONGBLOB COMPRE LONGBLOB <Correct error>
LONGBLOB COMPRE VARBINARY(65500 <Correct error>
TINYBLOB TINYBLOB ALL_NON_LOSSY <Correct value>
TINYBLOB BLOB ALL_NON_LOSSY <Correct value>
TINYBLOB MEDIUMBLOB ALL_NON_LOSSY <Correct value>
...
...
@@ -297,6 +333,26 @@ BIT(5) BIT(6) ALL_NON_LOSSY <Correct value>
BIT(6) BIT(5) ALL_NON_LOSSY <Correct error>
BIT(5) BIT(12) ALL_NON_LOSSY <Correct value>
BIT(12) BIT(5) ALL_NON_LOSSY <Correct error>
TINYBLOB COMPRE TINYBLOB ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE BLOB ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE MEDIUMBLOB ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE LONGBLOB ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE VARBINARY(255) ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED TINYBLOB ALL_NON_LOSSY <Correct error>
BLOB COMPRESSED BLOB ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED MEDIUMBLOB ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED LONGBLOB ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED VARBINARY(65500 ALL_NON_LOSSY <Correct error>
MEDIUMBLOB COMP TINYBLOB ALL_NON_LOSSY <Correct error>
MEDIUMBLOB COMP BLOB ALL_NON_LOSSY <Correct error>
MEDIUMBLOB COMP MEDIUMBLOB ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP LONGBLOB ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP VARBINARY(65500 ALL_NON_LOSSY <Correct error>
LONGBLOB COMPRE TINYBLOB ALL_NON_LOSSY <Correct error>
LONGBLOB COMPRE BLOB ALL_NON_LOSSY <Correct error>
LONGBLOB COMPRE MEDIUMBLOB ALL_NON_LOSSY <Correct error>
LONGBLOB COMPRE LONGBLOB ALL_NON_LOSSY <Correct value>
LONGBLOB COMPRE VARBINARY(65500 ALL_NON_LOSSY <Correct error>
TINYBLOB TINYBLOB ALL_LOSSY <Correct value>
TINYBLOB BLOB ALL_LOSSY <Correct error>
TINYBLOB MEDIUMBLOB ALL_LOSSY <Correct error>
...
...
@@ -418,6 +474,26 @@ BIT(5) BIT(6) ALL_LOSSY <Correct error>
BIT(6) BIT(5) ALL_LOSSY <Correct value>
BIT(5) BIT(12) ALL_LOSSY <Correct error>
BIT(12) BIT(5) ALL_LOSSY <Correct value>
TINYBLOB COMPRE TINYBLOB ALL_LOSSY <Correct error>
TINYBLOB COMPRE BLOB ALL_LOSSY <Correct error>
TINYBLOB COMPRE MEDIUMBLOB ALL_LOSSY <Correct error>
TINYBLOB COMPRE LONGBLOB ALL_LOSSY <Correct error>
TINYBLOB COMPRE VARBINARY(255) ALL_LOSSY <Correct error>
BLOB COMPRESSED TINYBLOB ALL_LOSSY <Correct value>
BLOB COMPRESSED BLOB ALL_LOSSY <Correct error>
BLOB COMPRESSED MEDIUMBLOB ALL_LOSSY <Correct error>
BLOB COMPRESSED LONGBLOB ALL_LOSSY <Correct error>
BLOB COMPRESSED VARBINARY(65500 ALL_LOSSY <Correct value>
MEDIUMBLOB COMP TINYBLOB ALL_LOSSY <Correct value>
MEDIUMBLOB COMP BLOB ALL_LOSSY <Correct value>
MEDIUMBLOB COMP MEDIUMBLOB ALL_LOSSY <Correct error>
MEDIUMBLOB COMP LONGBLOB ALL_LOSSY <Correct error>
MEDIUMBLOB COMP VARBINARY(65500 ALL_LOSSY <Correct value>
LONGBLOB COMPRE TINYBLOB ALL_LOSSY <Correct value>
LONGBLOB COMPRE BLOB ALL_LOSSY <Correct value>
LONGBLOB COMPRE MEDIUMBLOB ALL_LOSSY <Correct value>
LONGBLOB COMPRE LONGBLOB ALL_LOSSY <Correct error>
LONGBLOB COMPRE VARBINARY(65500 ALL_LOSSY <Correct value>
TINYBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
...
...
@@ -539,6 +615,26 @@ BIT(5) BIT(6) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BIT(6) BIT(5) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BIT(5) BIT(12) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BIT(12) BIT(5) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE LONGBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE VARBINARY(255) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED LONGBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP LONGBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB COMPRE TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB COMPRE BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB COMPRE MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB COMPRE LONGBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB COMPRE VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY <Correct value>
DROP TABLE type_conversions;
call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* error.* 1677");
connection master;
...
...
mysql-test/suite/rpl/include/rpl_typeconv.inc
View file @
9e9ea4f6
...
...
@@ -14,9 +14,9 @@ CREATE TABLE type_conversions (
Source
TEXT
,
Target
TEXT
,
Flags
TEXT
,
On_Master
TEXT
,
On_Slave
TEXT
,
Expected
TEXT
,
On_Master
LONG
TEXT
,
On_Slave
LONG
TEXT
,
Expected
LONG
TEXT
,
Compare
INT
,
Error
TEXT
);
...
...
mysql-test/suite/rpl/include/type_conversions.test
View file @
9e9ea4f6
...
...
@@ -876,5 +876,175 @@ let $can_convert = $if_is_lossy;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
--
echo
#
--
echo
# MDEV-15821 Row format replication from LONGBLOB COMPRESSED to LONGBLOB does not work
--
echo
#
# This is to make sure that the compressed data is longer than 64K
SET
column_compression_threshold
=
16
*
256
*
256
;
# TINYBLOB COMPRESSED
let
$source_type
=
TINYBLOB
COMPRESSED
;
let
$target_type
=
TINYBLOB
;
let
$source_value
=
REPEAT
(
'a'
,
250
);
let
$target_value
=
REPEAT
(
'a'
,
250
);
let
$can_convert
=
$if_is_non_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
let
$source_type
=
TINYBLOB
COMPRESSED
;
let
$target_type
=
BLOB
;
let
$source_value
=
REPEAT
(
'a'
,
250
);
let
$target_value
=
REPEAT
(
'a'
,
250
);
let
$can_convert
=
$if_is_non_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
let
$source_type
=
TINYBLOB
COMPRESSED
;
let
$target_type
=
MEDIUMBLOB
;
let
$source_value
=
REPEAT
(
'a'
,
250
);
let
$target_value
=
REPEAT
(
'a'
,
250
);
let
$can_convert
=
$if_is_non_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
let
$source_type
=
TINYBLOB
COMPRESSED
;
let
$target_type
=
LONGBLOB
;
let
$source_value
=
REPEAT
(
'a'
,
250
);
let
$target_value
=
REPEAT
(
'a'
,
250
);
let
$can_convert
=
$if_is_non_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
let
$source_type
=
TINYBLOB
COMPRESSED
;
let
$target_type
=
VARBINARY
(
255
);
let
$source_value
=
REPEAT
(
'a'
,
250
);
let
$target_value
=
REPEAT
(
'a'
,
250
);
let
$can_convert
=
$if_is_non_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
# BLOB COMPRESSED
let
$source_type
=
BLOB
COMPRESSED
;
let
$target_type
=
TINYBLOB
;
let
$source_value
=
REPEAT
(
'a'
,
64000
);
let
$target_value
=
REPEAT
(
'a'
,
255
);
let
$can_convert
=
$if_is_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
let
$source_type
=
BLOB
COMPRESSED
;
let
$target_type
=
BLOB
;
let
$source_value
=
REPEAT
(
'a'
,
64000
);
let
$target_value
=
REPEAT
(
'a'
,
64000
);
let
$can_convert
=
$if_is_non_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
let
$source_type
=
BLOB
COMPRESSED
;
let
$target_type
=
MEDIUMBLOB
;
let
$source_value
=
REPEAT
(
'a'
,
64000
);
let
$target_value
=
REPEAT
(
'a'
,
64000
);
let
$can_convert
=
$if_is_non_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
let
$source_type
=
BLOB
COMPRESSED
;
let
$target_type
=
LONGBLOB
;
let
$source_value
=
REPEAT
(
'a'
,
64000
);
let
$target_value
=
REPEAT
(
'a'
,
64000
);
let
$can_convert
=
$if_is_non_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
let
$source_type
=
BLOB
COMPRESSED
;
let
$target_type
=
VARBINARY
(
65500
);
let
$source_value
=
REPEAT
(
'a'
,
65500
);
let
$target_value
=
REPEAT
(
'a'
,
65500
);
let
$can_convert
=
$if_is_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
# MEDIUMBLOB COMPRESSED
let
$source_type
=
MEDIUMBLOB
COMPRESSED
;
let
$target_type
=
TINYBLOB
;
let
$source_value
=
REPEAT
(
'a'
,
66000
);
let
$target_value
=
REPEAT
(
'a'
,
255
);
let
$can_convert
=
$if_is_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
# This failed before the fix
let
$source_type
=
MEDIUMBLOB
COMPRESSED
;
let
$target_type
=
BLOB
;
let
$source_value
=
REPEAT
(
'a'
,
66000
);
let
$target_value
=
REPEAT
(
'a'
,
65535
);
let
$can_convert
=
$if_is_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
# This failed before the fix
let
$source_type
=
MEDIUMBLOB
COMPRESSED
;
let
$target_type
=
MEDIUMBLOB
;
let
$source_value
=
REPEAT
(
'a'
,
66000
);
let
$target_value
=
REPEAT
(
'a'
,
66000
);
let
$can_convert
=
$if_is_non_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
# This failed before the fix
let
$source_type
=
MEDIUMBLOB
COMPRESSED
;
let
$target_type
=
LONGBLOB
;
let
$source_value
=
REPEAT
(
'a'
,
66000
);
let
$target_value
=
REPEAT
(
'a'
,
66000
);
let
$can_convert
=
$if_is_non_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
# This failed before the fix
let
$source_type
=
MEDIUMBLOB
COMPRESSED
;
let
$target_type
=
VARBINARY
(
65500
);
let
$source_value
=
REPEAT
(
'a'
,
66000
);
let
$target_value
=
REPEAT
(
'a'
,
65500
);
let
$can_convert
=
$if_is_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
# LONGBLOB COMPRESSED
let
$source_type
=
LONGBLOB
COMPRESSED
;
let
$target_type
=
TINYBLOB
;
let
$source_value
=
REPEAT
(
'a'
,
66000
);
let
$target_value
=
REPEAT
(
'a'
,
255
);
let
$can_convert
=
$if_is_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
# This failed before the fix
let
$source_type
=
LONGBLOB
COMPRESSED
;
let
$target_type
=
BLOB
;
let
$source_value
=
REPEAT
(
'a'
,
66000
);
let
$target_value
=
REPEAT
(
'a'
,
65535
);
let
$can_convert
=
$if_is_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
# This failed before the fix
let
$source_type
=
LONGBLOB
COMPRESSED
;
let
$target_type
=
MEDIUMBLOB
;
let
$source_value
=
REPEAT
(
'a'
,
66000
);
let
$target_value
=
REPEAT
(
'a'
,
66000
);
let
$can_convert
=
$if_is_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
# This failed before the fix
let
$source_type
=
LONGBLOB
COMPRESSED
;
let
$target_type
=
LONGBLOB
;
let
$source_value
=
REPEAT
(
'a'
,
66000
);
let
$target_value
=
REPEAT
(
'a'
,
66000
);
let
$can_convert
=
$if_is_non_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
# This failed before the fix
let
$source_type
=
LONGBLOB
COMPRESSED
;
let
$target_type
=
VARBINARY
(
65500
);
let
$source_value
=
REPEAT
(
'a'
,
66000
);
let
$target_value
=
REPEAT
(
'a'
,
65500
);
let
$can_convert
=
$if_is_lossy
;
source
suite
/
rpl
/
include
/
check_type
.
inc
;
SET
column_compression_threshold
=
DEFAULT
;
--
echo
# End of MDEV-15833
--
source
include
/
rpl_reset
.
inc
enable_query_log
;
mysql-test/suite/rpl/r/rpl_typeconv.result
View file @
9e9ea4f6
...
...
@@ -7,9 +7,9 @@ TestNo INT AUTO_INCREMENT PRIMARY KEY,
Source TEXT,
Target TEXT,
Flags TEXT,
On_Master TEXT,
On_Slave TEXT,
Expected TEXT,
On_Master
LONG
TEXT,
On_Slave
LONG
TEXT,
Expected
LONG
TEXT,
Compare INT,
Error TEXT);
SELECT @@global.slave_type_conversions;
...
...
@@ -39,18 +39,34 @@ ALL_LOSSY,ALL_NON_LOSSY
connection slave;
SET GLOBAL SLAVE_TYPE_CONVERSIONS='';
**** Running tests with @@SLAVE_TYPE_CONVERSIONS = '' ****
#
# MDEV-15821 Row format replication from LONGBLOB COMPRESSED to LONGBLOB does not work
#
# End of MDEV-15833
include/rpl_reset.inc
connection slave;
SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_NON_LOSSY';
**** Running tests with @@SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY' ****
#
# MDEV-15821 Row format replication from LONGBLOB COMPRESSED to LONGBLOB does not work
#
# End of MDEV-15833
include/rpl_reset.inc
connection slave;
SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY';
**** Running tests with @@SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY' ****
#
# MDEV-15821 Row format replication from LONGBLOB COMPRESSED to LONGBLOB does not work
#
# End of MDEV-15833
include/rpl_reset.inc
connection slave;
SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY';
**** Running tests with @@SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY,ALL_NON_LOSSY' ****
#
# MDEV-15821 Row format replication from LONGBLOB COMPRESSED to LONGBLOB does not work
#
# End of MDEV-15833
include/rpl_reset.inc
connection slave;
**** Result of conversions ****
...
...
@@ -176,6 +192,26 @@ BIT(5) BIT(6) <Correct error>
BIT(6) BIT(5) <Correct error>
BIT(5) BIT(12) <Correct error>
BIT(12) BIT(5) <Correct error>
TINYBLOB COMPRE TINYBLOB <Correct error>
TINYBLOB COMPRE BLOB <Correct error>
TINYBLOB COMPRE MEDIUMBLOB <Correct error>
TINYBLOB COMPRE LONGBLOB <Correct error>
TINYBLOB COMPRE VARBINARY(255) <Correct error>
BLOB COMPRESSED TINYBLOB <Correct error>
BLOB COMPRESSED BLOB <Correct error>
BLOB COMPRESSED MEDIUMBLOB <Correct error>
BLOB COMPRESSED LONGBLOB <Correct error>
BLOB COMPRESSED VARBINARY(65500 <Correct error>
MEDIUMBLOB COMP TINYBLOB <Correct error>
MEDIUMBLOB COMP BLOB <Correct error>
MEDIUMBLOB COMP MEDIUMBLOB <Correct error>
MEDIUMBLOB COMP LONGBLOB <Correct error>
MEDIUMBLOB COMP VARBINARY(65500 <Correct error>
LONGBLOB COMPRE TINYBLOB <Correct error>
LONGBLOB COMPRE BLOB <Correct error>
LONGBLOB COMPRE MEDIUMBLOB <Correct error>
LONGBLOB COMPRE LONGBLOB <Correct error>
LONGBLOB COMPRE VARBINARY(65500 <Correct error>
TINYBLOB TINYBLOB ALL_NON_LOSSY <Correct value>
TINYBLOB BLOB ALL_NON_LOSSY <Correct value>
TINYBLOB MEDIUMBLOB ALL_NON_LOSSY <Correct value>
...
...
@@ -297,6 +333,26 @@ BIT(5) BIT(6) ALL_NON_LOSSY <Correct value>
BIT(6) BIT(5) ALL_NON_LOSSY <Correct error>
BIT(5) BIT(12) ALL_NON_LOSSY <Correct value>
BIT(12) BIT(5) ALL_NON_LOSSY <Correct error>
TINYBLOB COMPRE TINYBLOB ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE BLOB ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE MEDIUMBLOB ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE LONGBLOB ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE VARBINARY(255) ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED TINYBLOB ALL_NON_LOSSY <Correct error>
BLOB COMPRESSED BLOB ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED MEDIUMBLOB ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED LONGBLOB ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED VARBINARY(65500 ALL_NON_LOSSY <Correct error>
MEDIUMBLOB COMP TINYBLOB ALL_NON_LOSSY <Correct error>
MEDIUMBLOB COMP BLOB ALL_NON_LOSSY <Correct error>
MEDIUMBLOB COMP MEDIUMBLOB ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP LONGBLOB ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP VARBINARY(65500 ALL_NON_LOSSY <Correct error>
LONGBLOB COMPRE TINYBLOB ALL_NON_LOSSY <Correct error>
LONGBLOB COMPRE BLOB ALL_NON_LOSSY <Correct error>
LONGBLOB COMPRE MEDIUMBLOB ALL_NON_LOSSY <Correct error>
LONGBLOB COMPRE LONGBLOB ALL_NON_LOSSY <Correct value>
LONGBLOB COMPRE VARBINARY(65500 ALL_NON_LOSSY <Correct error>
TINYBLOB TINYBLOB ALL_LOSSY <Correct value>
TINYBLOB BLOB ALL_LOSSY <Correct error>
TINYBLOB MEDIUMBLOB ALL_LOSSY <Correct error>
...
...
@@ -418,6 +474,26 @@ BIT(5) BIT(6) ALL_LOSSY <Correct error>
BIT(6) BIT(5) ALL_LOSSY <Correct value>
BIT(5) BIT(12) ALL_LOSSY <Correct error>
BIT(12) BIT(5) ALL_LOSSY <Correct value>
TINYBLOB COMPRE TINYBLOB ALL_LOSSY <Correct error>
TINYBLOB COMPRE BLOB ALL_LOSSY <Correct error>
TINYBLOB COMPRE MEDIUMBLOB ALL_LOSSY <Correct error>
TINYBLOB COMPRE LONGBLOB ALL_LOSSY <Correct error>
TINYBLOB COMPRE VARBINARY(255) ALL_LOSSY <Correct error>
BLOB COMPRESSED TINYBLOB ALL_LOSSY <Correct value>
BLOB COMPRESSED BLOB ALL_LOSSY <Correct error>
BLOB COMPRESSED MEDIUMBLOB ALL_LOSSY <Correct error>
BLOB COMPRESSED LONGBLOB ALL_LOSSY <Correct error>
BLOB COMPRESSED VARBINARY(65500 ALL_LOSSY <Correct value>
MEDIUMBLOB COMP TINYBLOB ALL_LOSSY <Correct value>
MEDIUMBLOB COMP BLOB ALL_LOSSY <Correct value>
MEDIUMBLOB COMP MEDIUMBLOB ALL_LOSSY <Correct error>
MEDIUMBLOB COMP LONGBLOB ALL_LOSSY <Correct error>
MEDIUMBLOB COMP VARBINARY(65500 ALL_LOSSY <Correct value>
LONGBLOB COMPRE TINYBLOB ALL_LOSSY <Correct value>
LONGBLOB COMPRE BLOB ALL_LOSSY <Correct value>
LONGBLOB COMPRE MEDIUMBLOB ALL_LOSSY <Correct value>
LONGBLOB COMPRE LONGBLOB ALL_LOSSY <Correct error>
LONGBLOB COMPRE VARBINARY(65500 ALL_LOSSY <Correct value>
TINYBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
...
...
@@ -539,6 +615,26 @@ BIT(5) BIT(6) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BIT(6) BIT(5) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BIT(5) BIT(12) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BIT(12) BIT(5) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE LONGBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB COMPRE VARBINARY(255) ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED LONGBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BLOB COMPRESSED VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP LONGBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB COMP VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB COMPRE TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB COMPRE BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB COMPRE MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB COMPRE LONGBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB COMPRE VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY <Correct value>
DROP TABLE type_conversions;
call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* error.* 1677");
connection master;
...
...
sql/sql_type.cc
View file @
9e9ea4f6
...
...
@@ -1392,10 +1392,13 @@ Field *Type_handler_blob_compressed::make_conversion_table_field(TABLE *table,
const
Field
*
target
)
const
{
uint
pack_length
=
metadata
&
0x00ff
;
if
(
pack_length
<
1
||
pack_length
>
4
)
return
NULL
;
// Broken binary log?
return
new
(
table
->
in_use
->
mem_root
)
Field_blob_compressed
(
NULL
,
(
uchar
*
)
""
,
1
,
Field
::
NONE
,
&
empty_clex_str
,
table
->
s
,
2
,
target
->
charset
(),
table
->
s
,
pack_length
,
target
->
charset
(),
zlib_compression_method
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment