← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/bin_string.h

  • Committer: Lee Bieber
  • Date: 2010-12-15 16:23:36 UTC
  • mfrom: (1995.1.2 build)
  • Revision ID: kalebral@gmail.com-20101215162336-juntyt4gw4vgohg4
Merge Andrew - fix bug 628912: Crash / segfault in drizzled::Item_func::arguments (this=0x35) at ./drizzled/function/func.h
Merge Andrew - 663919: next query after KILL QUERY will error

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/bin_string.h
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
20
20
#ifndef DRIZZLED_ITEM_BIN_STRING_H
21
21
#define DRIZZLED_ITEM_BIN_STRING_H
22
22
 
23
 
#include <drizzled/charset_info.h>
24
23
#include <drizzled/item/hex_string.h>
25
24
 
26
 
#include "drizzled/visibility.h"
27
 
 
28
25
namespace drizzled
29
26
{
30
27
 
34
31
  Item_bin_string(const char *str,uint32_t str_length);
35
32
};
36
33
 
37
 
class DRIZZLED_API Item_result_field :
38
 
  public Item    /* Item with result field */
 
34
class Item_result_field :public Item    /* Item with result field */
39
35
{
40
36
public:
41
37
  Field *result_field;                          /* Save result here */