diff options
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/item.cc b/sql/item.cc index 541fbf7b178..7264f8b2d68 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -43,11 +43,11 @@ void Hybrid_type_traits::fix_length_and_dec(Item *item, Item *arg) const item->max_length= item->float_length(arg->decimals); } +static const Hybrid_type_traits real_traits_instance; const Hybrid_type_traits *Hybrid_type_traits::instance() { - static const Hybrid_type_traits real_traits; - return &real_traits; + return &real_traits_instance; } @@ -67,11 +67,11 @@ Hybrid_type_traits::val_str(Hybrid_type *val, String *to, uint8 decimals) const } /* Hybrid_type_traits_decimal */ +static const Hybrid_type_traits_decimal decimal_traits_instance; const Hybrid_type_traits_decimal *Hybrid_type_traits_decimal::instance() { - static const Hybrid_type_traits_decimal decimal_traits; - return &decimal_traits; + return &decimal_traits_instance; } @@ -143,11 +143,11 @@ Hybrid_type_traits_decimal::val_str(Hybrid_type *val, String *to, } /* Hybrid_type_traits_integer */ +static const Hybrid_type_traits_integer integer_traits_instance; const Hybrid_type_traits_integer *Hybrid_type_traits_integer::instance() { - static const Hybrid_type_traits_integer integer_traits; - return &integer_traits; + return &integer_traits_instance; } void |