diff --git a/src/sql/engine/expr/ob_expr_merge_result_type.map b/src/sql/engine/expr/ob_expr_merge_result_type.map index 14d607994..b3897880f 100644 --- a/src/sql/engine/expr/ob_expr_merge_result_type.map +++ b/src/sql/engine/expr/ob_expr_merge_result_type.map @@ -86,7 +86,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* TinyIntType=>ObTextType */ ObMediumTextType, /* TinyIntType=>ObMediumTextType */ ObLongTextType, /* TinyIntType=>ObLongTextType */ - ObVarcharType, /* TinyIntType=>ObBitType */ + ObNumberType, /* TinyIntType=>ObBitType */ ObVarcharType, /* TinyIntType=>ObeEnumType */ ObVarcharType, /* TinyIntType=>ObSetType */ ObMaxType, /* TinyIntType=>ObEnumInnerType */ @@ -140,7 +140,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* SmallIntType=>ObTextType */ ObMediumTextType, /* SmallIntType=>ObMediumTextType */ ObLongTextType, /* SmallIntType=>ObLongTextType */ - ObVarcharType, /* SmallIntType=>ObBitType */ + ObNumberType, /* SmallIntType=>ObBitType */ ObVarcharType, /* SmallIntType=>ObEnumType */ ObVarcharType, /* SmallIntType=>ObSetType */ ObMaxType, /* SmallIntType=>ObEnumInnerType */ @@ -194,7 +194,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* MediumIntType=>ObTextType */ ObMediumTextType, /* MediumIntType=>ObMediumTextType */ ObLongTextType, /* MediumIntType=>ObLongTextType */ - ObVarcharType, /* MediumIntType=>ObBitType */ + ObNumberType, /* MediumIntType=>ObBitType */ ObVarcharType, /* MediumIntType=>ObEnumType */ ObVarcharType, /* MediumIntType=>ObSetType */ ObMaxType, /* MediumIntType=>ObEnumInnerType */ @@ -248,7 +248,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* Int32Type=>ObTextType */ ObMediumTextType, /* Int32Type=>ObMediumTextType */ ObLongTextType, /* Int32Type=>ObLongTextType */ - ObVarcharType, /* Int32Type=>ObBitType */ + ObNumberType, /* Int32Type=>ObBitType */ ObVarcharType, /* Int32Type=>ObEnumType */ ObVarcharType, /* Int32Type=>ObSetType */ ObMaxType, /* Int32Type=>ObEnumInnerType */ @@ -302,7 +302,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* IntType=>ObTextType */ ObMediumTextType, /* IntType=>ObMediumTextType */ ObLongTextType, /* IntType=>ObLongTextType */ - ObVarcharType, /* IntType=>ObBitType */ + ObNumberType, /* IntType=>ObBitType */ ObVarcharType, /* IntType=>ObEnumType */ ObVarcharType, /* IntType=>ObSetType */ ObMaxType, /* IntType=>ObEnumInnerType */ @@ -356,7 +356,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* UTinyIntType=>ObTextType */ ObMediumTextType, /* UTinyIntType=>ObMediumTextType */ ObLongTextType, /* UTinyIntType=>ObLongTextType */ - ObVarcharType, /* UTinyIntType=>ObBitType */ + ObUInt64Type, /* UTinyIntType=>ObBitType */ ObVarcharType, /* UTinyIntType=>ObEnumType */ ObVarcharType, /* UTinyIntType=>ObSetType */ ObMaxType, /* UTinyIntType=>ObEnumInnerType */ @@ -410,7 +410,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* USmallIntType=>ObTextType */ ObMediumTextType, /* USmallIntType=>ObMediumTextType */ ObLongTextType, /* USmallIntType=>ObLongTextType */ - ObVarcharType, /* USmallIntType=>ObBitType */ + ObUInt64Type, /* USmallIntType=>ObBitType */ ObVarcharType, /* USmallIntType=>ObEnumType */ ObVarcharType, /* USmallIntType=>ObSetType */ ObMaxType, /* USmallIntType=>ObEnumInnerType */ @@ -464,7 +464,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* UMediumIntType=>ObTextType */ ObMediumTextType, /* UMediumIntType=>ObMediumTextType */ ObLongTextType, /* UMediumIntType=>ObLongTextType */ - ObVarcharType, /* UMediumIntType=>ObBitType */ + ObUInt64Type, /* UMediumIntType=>ObBitType */ ObVarcharType, /* UMediumIntType=>ObEnumType */ ObVarcharType, /* UMediumIntType=>ObSetType */ ObMaxType, /* UMediumIntType=>ObEnumInnerType */ @@ -518,7 +518,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* UInt32Type=>ObTextType */ ObMediumTextType, /* UInt32Type=>ObMediumTextType */ ObLongTextType, /* UInt32Type=>ObLongTextType */ - ObVarcharType, /* UInt32Type=>ObBitType */ + ObUInt64Type, /* UInt32Type=>ObBitType */ ObVarcharType, /* UInt32Type=>ObEnumType */ ObVarcharType, /* UInt32Type=>ObSetType */ ObMaxType, /* UInt32Type=>ObEnumInnerType */ @@ -572,7 +572,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* UIntType=>ObTextType */ ObMediumTextType, /* UIntType=>ObMediumTextType */ ObLongTextType, /* UIntType=>ObLongTextType */ - ObVarcharType, /* UIntType=>ObBitType */ + ObUInt64Type, /* UIntType=>ObBitType */ ObVarcharType, /* UIntType=>ObEnumType */ ObVarcharType, /* UIntType=>ObSetType */ ObMaxType, /* UIntType=>ObEnumInnerType */ @@ -626,7 +626,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* FloatType=>ObTextType */ ObMediumTextType, /* FloatType=>ObMediumTextType */ ObLongTextType, /* FloatType=>ObLongTextType */ - ObVarcharType, /* FloatType=>ObBitType */ + ObDoubleType, /* FloatType=>ObBitType */ ObVarcharType, /* FloatType=>ObEnumType */ ObVarcharType, /* FloatType=>ObSetType */ ObMaxType, /* FloatType=>ObEnumInnerType */ @@ -680,7 +680,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* DoubleType=>ObTextType */ ObMediumTextType, /* DoubleType=>ObMediumTextType */ ObLongTextType, /* DoubleType=>ObLongTextType */ - ObVarcharType, /* DoubleType=>ObBitType */ + ObDoubleType, /* DoubleType=>ObBitType */ ObVarcharType, /* DoubleType=>ObEnumType */ ObVarcharType, /* DoubleType=>ObSetType */ ObMaxType, /* DoubleType=>ObEnumInnerType */ @@ -734,7 +734,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* UFloatType=>ObTextType */ ObMediumTextType, /* UFloatType=>ObMediumTextType */ ObLongTextType, /* UFloatType=>ObLongTextType */ - ObVarcharType, /* UFloatType=>ObBitType */ + ObDoubleType, /* UFloatType=>ObBitType */ ObVarcharType, /* UFloatType=>ObEnumType */ ObVarcharType, /* UFloatType=>ObSetType */ ObMaxType, /* UFloatType=>ObEnumInnerType */ @@ -788,7 +788,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* UDoubleType=>ObTextType */ ObMediumTextType, /* UDoubleType=>ObMediumTextType */ ObLongTextType, /* UDoubleType=>ObLongTextType */ - ObVarcharType, /* UDoubleType=>ObBitType */ + ObDoubleType, /* UDoubleType=>ObBitType */ ObVarcharType, /* UDoubleType=>ObEnumType */ ObVarcharType, /* UDoubleType=>ObSetType */ ObMaxType, /* UDoubleType=>ObEnumInnerType */ @@ -842,7 +842,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* NumberType=>ObTextType */ ObMediumTextType, /* NumberType=>ObMediumTextType */ ObLongTextType, /* NumberType=>ObLongTextType */ - ObVarcharType, /* NumberType=>ObBitType */ + ObNumberType, /* NumberType=>ObBitType */ ObVarcharType, /* NumberType=>ObEnumType */ ObVarcharType, /* NumberType=>ObSetType */ ObMaxType, /* NumberType=>ObEnumInnerType */ @@ -896,7 +896,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* UNumberType=>ObTextType */ ObMediumTextType, /* UNumberType=>ObMediumTextType */ ObLongTextType, /* UNumberType=>ObLongTextType */ - ObVarcharType, /* UNumberType=>ObBitType */ + ObUNumberType, /* UNumberType=>ObBitType */ ObVarcharType, /* UNumberType=>ObEnumType */ ObVarcharType, /* UNumberType=>ObSetType */ ObMaxType, /* UNumberType=>ObEnumInnerType */ @@ -1166,7 +1166,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* YearType=>ObTextType */ ObMediumTextType, /* YearType=>ObMediumTextType */ ObLongTextType, /* YearType=>ObLongTextType */ - ObVarcharType, /* YearType=>ObBitType */ + ObUInt64Type, /* YearType=>ObBitType */ ObVarcharType, /* YearType=>ObEnumType */ ObVarcharType, /* YearType=>ObSetType */ ObMaxType, /* YearType=>ObEnumInnerType */ @@ -1274,7 +1274,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObLongTextType, /* CharType=>ObTextType */ ObLongTextType, /* CharType=>ObMediumTextType */ ObLongTextType, /* CharType=>ObLongTextType */ - ObCharType, /* CharType=>ObBitType */ + ObVarcharType, /* CharType=>ObBitType */ ObCharType, /* CharType=>ObEnumType */ ObCharType, /* CharType=>ObSetType */ ObMaxType, /* CharType=>ObEnumInnerType */ @@ -1672,34 +1672,34 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { /*ObBitType*/ { ObVarcharType, /*ObBitType=>NullType */ - ObVarcharType, /*ObBitType=>TinyIntType */ - ObVarcharType, /*ObBitType=>SmallIntType */ - ObVarcharType, /*ObBitType=>MediumIntType */ - ObVarcharType, /*ObBitType=>Int32Type */ - ObVarcharType, /*ObBitType=>IntType */ - ObVarcharType, /*ObBitType=>UTinyIntType */ - ObVarcharType, /*ObBitType=>USmallIntType */ - ObVarcharType, /*ObBitType=>UMediumIntType */ - ObVarcharType, /*ObBitType=>UInt32Type */ - ObVarcharType, /*ObBitType=>UIntType */ - ObVarcharType, /*ObBitType=>FloatType */ - ObVarcharType, /*ObBitType=>DoubleType */ - ObVarcharType, /*ObBitType=>UFloatType */ - ObVarcharType, /*ObBitType=>UDoubleType */ - ObVarcharType, /*ObBitType=>NumberType */ - ObVarcharType, /*ObBitType=>UNumberType */ - ObVarcharType, /*ObBitType=>DateTimeType */ + ObNumberType, /*ObBitType=>TinyIntType */ + ObNumberType, /*ObBitType=>SmallIntType */ + ObNumberType, /*ObBitType=>MediumIntType */ + ObNumberType, /*ObBitType=>Int32Type */ + ObNumberType, /*ObBitType=>IntType */ + ObUInt64Type, /*ObBitType=>UTinyIntType */ + ObUInt64Type, /*ObBitType=>USmallIntType */ + ObUInt64Type, /*ObBitType=>UMediumIntType */ + ObUInt64Type, /*ObBitType=>UInt32Type */ + ObUInt64Type, /*ObBitType=>UIntType */ + ObDoubleType, /*ObBitType=>FloatType */ + ObDoubleType, /*ObBitType=>DoubleType */ + ObDoubleType, /*ObBitType=>UFloatType */ + ObDoubleType, /*ObBitType=>UDoubleType */ + ObNumberType, /*ObBitType=>NumberType */ + ObUNumberType, /*ObBitType=>UNumberType */ + ObVarcharType, /*ObBitType=>DateTimeType */ ObVarcharType, /*ObBitType=>TimestampType */ ObVarcharType, /*ObBitType=>DateType */ ObVarcharType, /*ObBitType=>TimeType */ - ObVarcharType, /*ObBitType=>YearType */ + ObUInt64Type, /*ObBitType=>YearType */ ObVarcharType, /*ObBitType=>VarcharType */ - ObCharType, /*ObBitType=>CharType */ + ObVarcharType, /*ObBitType=>CharType */ ObVarcharType, /*ObBitType=>HexStringType */ ObMaxType, /*ObBitType=>ExtendType */ ObVarcharType, /*ObBitType=>UnknownType */ ObLongTextType, /*ObBitType=>ObTinyTextType */ - ObLongTextType, /* ObBitType=>ObTextType */ + ObLongTextType, /* ObBitType=>ObTextType */ ObLongTextType, /* ObBitType=>ObMediumTextType */ ObLongTextType, /* ObBitType=>ObLongTextType */ ObBitType, /* ObBitType=>ObBitType */ diff --git a/tools/deploy/mysql_test/test_suite/pl/r/mysql/sp-vars_mysql.result b/tools/deploy/mysql_test/test_suite/pl/r/mysql/sp-vars_mysql.result index cf0422292..72559e08f 100644 --- a/tools/deploy/mysql_test/test_suite/pl/r/mysql/sp-vars_mysql.result +++ b/tools/deploy/mysql_test/test_suite/pl/r/mysql/sp-vars_mysql.result @@ -990,7 +990,7 @@ call proc_12976_a(); +-------------------------+--------------------+ | coalesce(localvar, 1)+1 | coalesce(val, 1)+1 | +-------------------------+--------------------+ -| 1 | 1 | +| 2 | 2 | +-------------------------+--------------------+ call proc_12976_b('A', @ep, @msg); +------+------+