← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/data_dictionary.cc

  • Committer: Brian Aker
  • Date: 2010-12-10 03:50:07 UTC
  • mto: (1992.4.2 system-tables)
  • mto: This revision was merged to the branch mainline in revision 2001.
  • Revision ID: brian@tangent.org-20101210035007-w8ld6aze3ub0cu2s
Additional cerr output bits for a few classes (Item, Field,...)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/data_dictionary.cc
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (C) 2007, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 2007, 2009, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
16
16
 
17
17
*****************************************************************************/
18
18
 
19
 
#include <config.h>
 
19
#include "config.h"
20
20
 
21
21
#include "data_dictionary.h"
22
22
 
23
 
#include <drizzled/current_session.h>
 
23
#include "drizzled/current_session.h"
24
24
 
 
25
extern "C" {
25
26
#include "trx0i_s.h"
26
27
#include "trx0trx.h" /* for TRX_QUE_STATE_STR_MAX_LEN */
27
28
#include "buf0buddy.h" /* for i_s_cmpmem */
33
34
#include "dict0load.h"  /* for file sys_tables related info. */
34
35
#include "dict0mem.h"
35
36
#include "dict0types.h"
 
37
}
36
38
#include "handler0vars.h"
37
39
 
38
40
using namespace drizzled;
757
759
 
758
760
  if (trx_i_s_cache_is_truncated(trx_i_s_cache))
759
761
  {
760
 
    errmsg_printf(error::ERROR, _("Warning: data in %s truncated due to memory limit of %d bytes\n"), 
 
762
    errmsg_printf(ERRMSG_LVL_ERROR, _("Warning: data in %s truncated due to memory limit of %d bytes\n"), 
761
763
                  table_name, TRX_I_S_MEM_LIMIT);
762
764
  } 
763
765
 
845
847
   bufend = innobase_convert_name(buf, sizeof(buf),
846
848
                                  row->lock_table,
847
849
                                  strlen(row->lock_table),
848
 
                                  &getSession(), TRUE);
 
850
                                  current_session, TRUE);
849
851
   push(bufend);
850
852
 
851
853
   if (row->lock_index != NULL)
853
855
     bufend = innobase_convert_name(buf, sizeof(buf),
854
856
                                    row->lock_index,
855
857
                                    strlen(row->lock_index),
856
 
                                    &getSession(), FALSE);
 
858
                                    current_session, FALSE);
857
859
     push(bufend);     
858
860
   }
859
861
   else