← 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: Andrew Hutchings
  • Date: 2011-01-04 20:16:55 UTC
  • mto: This revision was merged to the branch mainline in revision 2057.
  • Revision ID: andrew@linuxjedi.co.uk-20110104201655-fm6splh5wqpv8wnb
Revert join_cache buffer cleanup, causes valgrind problems and as much as I don't like it I think the current implementation seems to work

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/data_dictionary.cc
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
25
#include "trx0i_s.h"
26
26
#include "trx0trx.h" /* for TRX_QUE_STATE_STR_MAX_LEN */
757
757
 
758
758
  if (trx_i_s_cache_is_truncated(trx_i_s_cache))
759
759
  {
760
 
    errmsg_printf(error::ERROR, _("Warning: data in %s truncated due to memory limit of %d bytes\n"), 
 
760
    errmsg_printf(ERRMSG_LVL_ERROR, _("Warning: data in %s truncated due to memory limit of %d bytes\n"), 
761
761
                  table_name, TRX_I_S_MEM_LIMIT);
762
762
  } 
763
763
 
845
845
   bufend = innobase_convert_name(buf, sizeof(buf),
846
846
                                  row->lock_table,
847
847
                                  strlen(row->lock_table),
848
 
                                  &getSession(), TRUE);
 
848
                                  current_session, TRUE);
849
849
   push(bufend);
850
850
 
851
851
   if (row->lock_index != NULL)
853
853
     bufend = innobase_convert_name(buf, sizeof(buf),
854
854
                                    row->lock_index,
855
855
                                    strlen(row->lock_index),
856
 
                                    &getSession(), FALSE);
 
856
                                    current_session, FALSE);
857
857
     push(bufend);     
858
858
   }
859
859
   else