Merge branch 'bb-10.8-release' into bb-10.9-release

Author: sanja-byelkin

plugin/type_inet/mysql-test/type_inet/type_inet6.result

@@ -2250,11 +2250,14 @@ Warnings:
 Warning	1292	Truncated incorrect max_sort_length value: '4'
 CREATE TEMPORARY TABLE t1(c INET6,d DATE);
 INSERT INTO t1 VALUES(0,0);
-ERROR HY000: Illegal parameter data types inet6 and int for operation 'SET'
+Warnings:
+Warning	4078	Cannot cast 'int' as 'inet6' in assignment of `test`.`t1`.`c`
+Warning	1292	Incorrect inet6 value: '0' for column `test`.`t1`.`c` at row 1
 INSERT INTO t1 VALUES('::',0);
 SELECT c FROM t1 ORDER BY c;
 c
 ::
+::
 DROP TABLE t1;
 SET max_sort_length=DEFAULT;
 SET sql_mode=DEFAULT;

plugin/type_inet/mysql-test/type_inet/type_inet6.test

@@ -1652,7 +1652,6 @@ DROP TABLE t1, t2;
 SET sql_mode='';
 SET @@SESSION.max_sort_length=4;
 CREATE TEMPORARY TABLE t1(c INET6,d DATE);
---error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
 INSERT INTO t1 VALUES(0,0);
 INSERT INTO t1 VALUES('::',0);
 SELECT c FROM t1 ORDER BY c;