~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2011-02-04 10:18:35 UTC
  • mfrom: (2143.1.4 drizzle-build)
  • Revision ID: brian@tangent.org-20110204101835-j23pv0febg9p0a2p
Merge of all local trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
845
845
   bufend = innobase_convert_name(buf, sizeof(buf),
846
846
                                  row->lock_table,
847
847
                                  strlen(row->lock_table),
848
 
                                  current_session, TRUE);
 
848
                                  &getSession(), 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
 
                                    current_session, FALSE);
 
856
                                    &getSession(), FALSE);
857
857
     push(bufend);     
858
858
   }
859
859
   else