MDEV-21765 Possibly inconsistent behavior of BIT_xx functions with IN…

…ET6 field Disallow BIT_AND(), BIT_OR(), BIT_XOR() for data types GEOMETRY and INET6, as they cannot return any useful integer values.
MariaDB · Jun 9, 2020 · 76cb2f9 · 76cb2f9
1 parent 01e8459
commit 76cb2f9
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 0 deletions.
diff --git a/mysql-test/main/gis.result b/mysql-test/main/gis.result
@@ -5315,5 +5315,16 @@ SELECT EXTRACT(DAY FROM a) FROM t1;
 ERROR HY000: Illegal parameter data type geometry for operation 'extract(day)'
 DROP TABLE t1;
 #
+# MDEV-21765 Possibly inconsistent behavior of BIT_xx functions with INET6 field
+#
+CREATE TABLE t1 (a GEOMETRY);
+SELECT BIT_AND(a) FROM t1;
+ERROR HY000: Illegal parameter data type geometry for operation 'bit_and('
+SELECT BIT_OR(a) FROM t1;
+ERROR HY000: Illegal parameter data type geometry for operation 'bit_or('
+SELECT BIT_XOR(a) FROM t1;
+ERROR HY000: Illegal parameter data type geometry for operation 'bit_xor('
+DROP TABLE t1;
+#
 # End of 10.5 tests
 #
diff --git a/mysql-test/main/gis.test b/mysql-test/main/gis.test
@@ -3318,6 +3318,20 @@ CREATE TABLE t1 (a GEOMETRY);
 SELECT EXTRACT(DAY FROM a) FROM t1;
 DROP TABLE t1;
 
+--echo #
+--echo # MDEV-21765 Possibly inconsistent behavior of BIT_xx functions with INET6 field
+--echo #
+
+CREATE TABLE t1 (a GEOMETRY);
+--error ER_ILLEGAL_PARAMETER_DATA_TYPE_FOR_OPERATION
+SELECT BIT_AND(a) FROM t1;
+--error ER_ILLEGAL_PARAMETER_DATA_TYPE_FOR_OPERATION
+SELECT BIT_OR(a) FROM t1;
+--error ER_ILLEGAL_PARAMETER_DATA_TYPE_FOR_OPERATION
+SELECT BIT_XOR(a) FROM t1;
+DROP TABLE t1;
+
+
 --echo #
 --echo # End of 10.5 tests
 --echo #
diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6.result b/plugin/type_inet/mysql-test/type_inet/type_inet6.result
@@ -909,6 +909,17 @@ a	GROUP_CONCAT(a ORDER BY a)
 ::2	::2,::2,::2,::2
 DROP TABLE t1;
 #
+# MDEV-21765 Possibly inconsistent behavior of BIT_xx functions with INET6 field
+#
+CREATE TABLE t1 (a INET6);
+SELECT BIT_AND(a) FROM t1;
+ERROR HY000: Illegal parameter data type inet6 for operation 'bit_and('
+SELECT BIT_OR(a) FROM t1;
+ERROR HY000: Illegal parameter data type inet6 for operation 'bit_or('
+SELECT BIT_XOR(a) FROM t1;
+ERROR HY000: Illegal parameter data type inet6 for operation 'bit_xor('
+DROP TABLE t1;
+#
 # Window functions
 #
 CREATE TABLE t1 (a INET6);

diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6.test b/plugin/type_inet/mysql-test/type_inet/type_inet6.test
@@ -536,6 +536,20 @@ SELECT GROUP_CONCAT(a ORDER BY a) FROM t1;
 SELECT a, GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a;
 DROP TABLE t1;
 
+--echo #
+--echo # MDEV-21765 Possibly inconsistent behavior of BIT_xx functions with INET6 field
+--echo #
+
+CREATE TABLE t1 (a INET6);
+--error ER_ILLEGAL_PARAMETER_DATA_TYPE_FOR_OPERATION
+SELECT BIT_AND(a) FROM t1;
+--error ER_ILLEGAL_PARAMETER_DATA_TYPE_FOR_OPERATION
+SELECT BIT_OR(a) FROM t1;
+--error ER_ILLEGAL_PARAMETER_DATA_TYPE_FOR_OPERATION
+SELECT BIT_XOR(a) FROM t1;
+DROP TABLE t1;
+
+
 --echo #
 --echo # Window functions
 --echo #

diff --git a/sql/item_sum.h b/sql/item_sum.h
@@ -1208,6 +1208,8 @@ class Item_sum_bit :public Item_sum_int
   const Type_handler *type_handler() const { return &type_handler_ulonglong; }
   bool fix_length_and_dec()
   {
+    if (args[0]->check_type_can_return_int(func_name()))
+      return true;
     decimals= 0; max_length=21; unsigned_flag= 1; maybe_null= null_value= 0;
     return FALSE;
   }