← 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-07 09:12:12 UTC
  • mto: This revision was merged to the branch mainline in revision 1985.
  • Revision ID: brian@tangent.org-20101207091212-1m0w20tck6z7632m
This is a fix for bug lp:686197

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/data_dictionary.cc
897
897
    push(static_cast<int64_t>(row->trx_weight));
898
898
    push(static_cast<uint64_t>(row->trx_mysql_thread_id));
899
899
    if (row->trx_query)
 
900
    {
900
901
      push(row->trx_query);
901
 
    else
902
 
      push();
903
 
 
904
 
    if (row->trx_operation_state)
905
 
      push(row->trx_operation_state);
906
 
    else
907
 
      push();
908
 
 
 
902
    }
 
903
    else
 
904
    {
 
905
      push();
 
906
    }
 
907
    push(row->trx_operation_state);
909
908
//    push(row->trx_tables_in_use);
910
909
    push(static_cast<uint64_t>(row->trx_tables_locked));
911
910
    push(static_cast<uint64_t>(row->trx_lock_structs));
916
915
    push(row->trx_isolation_level);
917
916
    push(static_cast<uint64_t>(row->trx_unique_checks));
918
917
    push(static_cast<uint64_t>(row->trx_foreign_key_checks));
919
 
    if (row->trx_foreign_key_error)
920
 
      push(row->trx_foreign_key_error);
921
 
    else
922
 
      push();
923
 
 
 
918
    push(row->trx_foreign_key_error);
924
919
    push(static_cast<uint64_t>(row->trx_has_search_latch));
925
920
    push(static_cast<uint64_t>(row->trx_search_latch_timeout));
926
921
}