~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cache_int.cc

Merge Stewart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
47
47
  return str;
48
48
}
49
49
 
50
 
type::Decimal *Item_cache_int::val_decimal(type::Decimal *decimal_val)
 
50
my_decimal *Item_cache_int::val_decimal(my_decimal *decimal_val)
51
51
{
52
52
  assert(fixed == 1);
53
 
  int2_class_decimal(E_DEC_FATAL_ERROR, value, unsigned_flag, decimal_val);
 
53
  int2my_decimal(E_DEC_FATAL_ERROR, value, unsigned_flag, decimal_val);
54
54
  return decimal_val;
55
55
}
56
56