MDEV-25080 Fix a corner case in DataConvert::joinColTypeForUnion().

tntnatbry · tntnatbry · commit 8bf545bc2e7f · 2023-02-27T09:01:24.000-05:00
diff --git a/utils/dataconvert/dataconvert.cpp b/utils/dataconvert/dataconvert.cpp
@@ -2975,7 +2975,7 @@ void DataConvert::joinColTypeForUnion(datatypes::SystemCatalog::TypeHolderStd& u
         case datatypes::SystemCatalog::UBIGINT:
         case datatypes::SystemCatalog::UDECIMAL:
 
-          if (type.scale != 0 && unionedType.scale != 0)
+          if (type.scale != 0 && (unionedType.scale != 0 || isDecimal(unionedType.colDataType)))
           {
             const unsigned int digitsBeforeDecimal = type.precision - type.scale;
             const unsigned int digitsBeforeDecimalUnion = unionedType.precision - unionedType.scale;

Original file line number	Diff line number	Diff line change
`@@ -2975,7 +2975,7 @@ void DataConvert::joinColTypeForUnion(datatypes::SystemCatalog::TypeHolderStd& u`
`2975`	`2975`	`case datatypes::SystemCatalog::UBIGINT:`
`2976`	`2976`	`case datatypes::SystemCatalog::UDECIMAL:`
`2977`	`2977`
`2978`		`- if (type.scale != 0 && unionedType.scale != 0)`
	`2978`	`+ if (type.scale != 0 && (unionedType.scale != 0 \|\| isDecimal(unionedType.colDataType)))`
`2979`	`2979`	`{`
`2980`	`2980`	`const unsigned int digitsBeforeDecimal = type.precision - type.scale;`
`2981`	`2981`	`const unsigned int digitsBeforeDecimalUnion = unionedType.precision - unionedType.scale;`