← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/int.cc

Merge Revision revid:marko.makela@oracle.com-20100601140355-u3kxl0yl0ljl5tx9 from MySQL InnoDB

Original revid:marko.makela@oracle.com-20100601140355-u3kxl0yl0ljl5tx9

Original Authors: Marko Mäkelä <marko.makela@oracle.com>
Original commit message:
Merge a change from mysql-5.1-innodb:

  ------------------------------------------------------------
  revno: 3491
  revision-id: marko.makela@oracle.com-20100601134335-ccthwwru23kn09qw
  parent: marko.makela@oracle.com-20100601120751-1uq7bbta5n7ts0qr
  committer: Marko Mäkelä <marko.makela@oracle.com>
  branch nick: 5.1-innodb
  timestamp: Tue 2010-06-01 16:43:35 +0300
  message:
    Bug#48197: Concurrent rw_lock_free may cause assertion failure

    rw_lock_t: Remove magic_n unless UNIV_DEBUG is defined.
    rw_lock_free(): Invalidate magic_n only after removing from rw_lock_list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/int.cc
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
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
21
 
 
22
 
#include <drizzled/charset_info.h>
23
 
#include <drizzled/field.h>
24
 
#include <drizzled/internal/m_string.h>
 
20
#include "config.h"
25
21
#include <drizzled/item/int.h>
 
22
#include "drizzled/internal/m_string.h"
26
23
 
27
24
namespace drizzled
28
25
{
43
40
  fixed= 1;
44
41
}
45
42
 
46
 
type::Decimal *Item_int::val_decimal(type::Decimal *decimal_value)
 
43
my_decimal *Item_int::val_decimal(my_decimal *decimal_value)
47
44
{
48
 
  int2_class_decimal(E_DEC_FATAL_ERROR, value, unsigned_flag, decimal_value);
 
45
  int2my_decimal(E_DEC_FATAL_ERROR, value, unsigned_flag, decimal_value);
49
46
  return decimal_value;
50
47
}
51
48