← 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: Lee Bieber
  • Date: 2010-12-08 18:48:04 UTC
  • mfrom: (1978.1.1 trunk-bug-684453)
  • Revision ID: kalebral@gmail.com-20101208184804-x59nfuocx82sqxcw
Merge Andrew - Fix bug 684453: Server crash accessing data dictionary table while a transaction is open

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
 
    {
901
900
      push(row->trx_query);
902
 
    }
903
 
    else
904
 
    {
905
 
      push();
906
 
    }
907
 
    push(row->trx_operation_state);
 
901
    else
 
902
      push();
 
903
 
 
904
    if (row->trx_operation_state)
 
905
      push(row->trx_operation_state);
 
906
    else
 
907
      push();
 
908
 
908
909
//    push(row->trx_tables_in_use);
909
910
    push(static_cast<uint64_t>(row->trx_tables_locked));
910
911
    push(static_cast<uint64_t>(row->trx_lock_structs));
915
916
    push(row->trx_isolation_level);
916
917
    push(static_cast<uint64_t>(row->trx_unique_checks));
917
918
    push(static_cast<uint64_t>(row->trx_foreign_key_checks));
918
 
    push(row->trx_foreign_key_error);
 
919
    if (row->trx_foreign_key_error)
 
920
      push(row->trx_foreign_key_error);
 
921
    else
 
922
      push();
 
923
 
919
924
    push(static_cast<uint64_t>(row->trx_has_search_latch));
920
925
    push(static_cast<uint64_t>(row->trx_search_latch_timeout));
921
926
}