mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use dbug_print_decimal instead of DBUG_EXECUTE

Browse source 
Portability fix
Note: rpl_trunc_binlog fails, but Sergei has promised to fix it, so I will ignore it for now
This commit is contained in:
monty@mysql.com 2005-02-20 00:24:30 +02:00
parent 5bfcabf7cd
commit f3b00a0413
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sql/field.cc
View file

@ -1557,7 +1557,7 @@ bool Field_new_decimal::store_value(const my_decimal *decimal_value)
my_decimal *dec= (my_decimal*)decimal_value;
int error= 0;
DBUG_ENTER("Field_new_decimal::store_value");
DBUG_EXECUTE("enter", print_decimal(dec););
dbug_print_decimal("enter", "value: %s", dec);
/* check that we do not try to write negative value in unsigned field */
if (unsigned_flag && decimal_value->sign())
@ -1569,7 +1569,7 @@ bool Field_new_decimal::store_value(const my_decimal *decimal_value)
}
DBUG_PRINT("info", ("saving with precision %d, scale: %d",
(int)field_length, (int)decimals()));
DBUG_EXECUTE("info", print_decimal(dec););
dbug_print_decimal("info", "value: %s", dec);
if (warn_if_overflow(my_decimal2binary(E_DEC_FATAL_ERROR &
~E_DEC_OVERFLOW,
@ -1581,8 +1581,7 @@ bool Field_new_decimal::store_value(const my_decimal *decimal_value)
DBUG_PRINT("info", ("overflow"));
set_value_on_overflow(&buff, dec->sign());
my_decimal2binary(E_DEC_FATAL_ERROR, &buff, ptr, field_length, decimals());
DBUG_EXECUTE("info", print_decimal_buff(&buff, (byte *) ptr, bin_size););
DBUG_RETURN(1);
error= 1;
}
DBUG_EXECUTE("info", print_decimal_buff(dec, (byte *) ptr, bin_size););
DBUG_RETURN(error);
@ -1616,7 +1615,7 @@ int Field_new_decimal::store(const char *from, uint length,
break;
}
DBUG_EXECUTE("info", print_decimal(&decimal_value););
dbug_print_decimal("enter", "value: %s", &decimal_value);
store_value(&decimal_value);
DBUG_RETURN(err);
}
@ -1708,7 +1707,8 @@ my_decimal* Field_new_decimal::val_decimal(my_decimal *decimal_value)
binary2my_decimal(E_DEC_FATAL_ERROR, ptr, decimal_value,
field_length,
decimals());
DBUG_EXECUTE("info", print_decimal_buff(decimal_value, (byte *) ptr, bin_size););
DBUG_EXECUTE("info", print_decimal_buff(decimal_value, (byte *) ptr,
bin_size););
DBUG_RETURN(decimal_value);
}

4
sql/item.h
View file

@ -463,11 +463,7 @@ public:
longlong val_int();
String *val_str(String *sp);
my_decimal *val_decimal(my_decimal *);
#ifdef __WIN__
bool is_null();
#else
inline bool is_null();
#endif
void print(String *str);
inline void make_field(Send_field *field)

2
sql/my_decimal.cc
View file

@ -228,7 +228,7 @@ void dbug_print_decimal(const char *tag, const char *format, my_decimal *val)
str.set("NULL", 4, &my_charset_bin);
else
my_decimal2string(0, val, 0, 0, 0, &str);
DBUG_PRINT(tag, (format, val));
DBUG_PRINT(tag, (format, (char*) str.ptr()));
}
#endif