← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

  • Committer: Stewart Smith
  • Date: 2010-08-05 16:41:55 UTC
  • mfrom: (1638.9.13)
  • mto: (1720.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 1721.
  • Revision ID: stewart@flamingspork.com-20100805164155-7olu6iv6rwoxfsne
Merged store-foreign-key-in-table-proto into show-create-table-using-table-message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
43
43
 
44
44
#include "config.h"
45
45
 
 
46
#include <cstdio>
46
47
#include <stdarg.h>
47
48
 
48
49
#include <drizzled/session.h>
64
65
*/
65
66
void DRIZZLE_ERROR::set_msg(Session *session, const char *msg_arg)
66
67
{
67
 
  msg= strdup_root(&session->warn_root, msg_arg);
 
68
  msg= session->warn_root.strdup_root(msg_arg);
68
69
}
69
70
 
70
71
/*
86
87
  if (session->getQueryId() != session->getWarningQueryId() || force)
87
88
  {
88
89
    session->setWarningQueryId(session->getQueryId());
89
 
    free_root(&session->warn_root,MYF(0));
 
90
    session->warn_root.free_root(MYF(0));
90
91
    memset(session->warn_count, 0, sizeof(session->warn_count));
91
92
    if (force)
92
93
      session->total_warn_count= 0;