← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

  • Committer: Brian Aker
  • Date: 2010-11-08 18:24:58 UTC
  • mto: (1921.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 1916.
  • Revision ID: brian@tangent.org-20101108182458-twv4hyix43ojno80
Merge in changes such that lock is now broken out into its own directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA */
 
14
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA */
15
15
 
16
16
/**********************************************************************
17
17
This file contains the implementation of error and warnings related
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;