summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 9918b7c40f6..2fe47406b9e 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2615,7 +2615,8 @@ void Item_func_round::fix_length_and_dec()
case INT_RESULT:
if ((!decimals_to_set && truncate) || (args[0]->decimal_precision() < DECIMAL_LONGLONG_DIGITS))
{
- int length_can_increase= test(!truncate && (val1 < 0) && !val1_unsigned);
+ int length_can_increase= MY_TEST(!truncate && (val1 < 0) &&
+ !val1_unsigned);
max_length= args[0]->max_length + length_can_increase;
/* Here we can keep INT_RESULT */
cached_result_type= INT_RESULT;
@@ -4617,7 +4618,7 @@ longlong Item_func_sleep::val_int()
mysql_cond_destroy(&cond);
- return test(!error); // Return 1 killed
+ return MY_TEST(!error); // Return 1 killed
}
@@ -6684,7 +6685,7 @@ void Item_func_sp::fix_length_and_dec()
max_length= sp_result_field->field_length;
collation.set(sp_result_field->charset());
maybe_null= 1;
- unsigned_flag= test(sp_result_field->flags & UNSIGNED_FLAG);
+ unsigned_flag= MY_TEST(sp_result_field->flags & UNSIGNED_FLAG);
DBUG_VOID_RETURN;
}