← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/memory/sql_alloc.h

  • Committer: Lee Bieber
  • Date: 2010-11-07 19:34:48 UTC
  • mfrom: (1910.1.2 build)
  • Revision ID: kalebral@gmail.com-20101107193448-64kdu912qej354sh
Merge Stewart - including adapting and expanding the "differences from mysql" page from the wiki.
Merge Stewart - fix bug 668143: drizzleslap with --commit runs second iteration data load in a transaction

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/memory/sql_alloc.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
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
 
21
 
 
22
20
#ifndef DRIZZLED_MEMORY_SQL_ALLOC_H
23
21
#define DRIZZLED_MEMORY_SQL_ALLOC_H
24
22
 
25
23
#include <unistd.h>
26
24
#include "drizzled/memory/root.h"
27
25
 
28
 
#include "drizzled/visibility.h"
29
 
 
30
26
namespace drizzled
31
27
{
32
28
class Session;
41
37
char *sql_strmake(const char *str, size_t len);
42
38
void *sql_memdup(const void * ptr, size_t size);
43
39
 
44
 
class DRIZZLED_API SqlAlloc
 
40
class SqlAlloc
45
41
{
46
42
public:
47
43
  static void *operator new(size_t size);