← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/memory/sql_alloc.cc

  • Committer: Monty Taylor
  • Date: 2010-08-12 20:27:32 UTC
  • mto: (1720.1.5 build)
  • mto: This revision was merged to the branch mainline in revision 1722.
  • Revision ID: mordred@inaugust.com-20100812202732-9kzchbkvkyki4n3u
Merged libdrizzle directly into tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/memory/sql_alloc.cc
11
11
 
12
12
   You should have received a copy of the GNU General Public License
13
13
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
 
17
17
/* Mallocs for used in threads */
18
18
 
19
 
#include <config.h>
 
19
#include "config.h"
20
20
 
21
21
#include <string.h>
22
22
 
23
 
#include <drizzled/errmsg_print.h>
24
 
#include <drizzled/memory/sql_alloc.h>
25
 
#include <drizzled/current_session.h>
26
 
#include <drizzled/error.h>
27
 
#include <drizzled/definitions.h>
 
23
#include "drizzled/errmsg_print.h"
 
24
#include "drizzled/memory/sql_alloc.h"
 
25
#include "drizzled/current_session.h"
 
26
#include "drizzled/error.h"
 
27
#include "drizzled/definitions.h"
28
28
 
29
 
#include <drizzled/internal/my_sys.h>
 
29
#include "drizzled/internal/my_sys.h"
30
30
 
31
31
namespace drizzled
32
32
{
33
33
 
34
34
static void sql_alloc_error_handler(void)
35
35
{
36
 
  errmsg_printf(error::ERROR, "%s",ER(ER_OUT_OF_RESOURCES));
 
36
  errmsg_printf(ERRMSG_LVL_ERROR, "%s",ER(ER_OUT_OF_RESOURCES));
37
37
}
38
38
 
39
39
void memory::init_sql_alloc(memory::Root *mem_root, size_t block_size, size_t)