← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/include/trx0trx.h

  • Committer: Brian Aker
  • Date: 2008-10-20 04:28:21 UTC
  • mto: (492.3.21 drizzle-clean-code)
  • mto: This revision was merged to the branch mainline in revision 530.
  • Revision ID: brian@tangent.org-20081020042821-rqqdrccuu8195k3y
Second pass of thd cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/include/trx0trx.h
347
347
/**************************************************************************
348
348
Prints info about a transaction to the given file. The caller must own the
349
349
kernel mutex and must have called
350
 
innobase_mysql_prepare_print_arbitrary_thd(), unless he knows that MySQL
 
350
innobase_mysql_prepare_print_arbitrary_session(), unless he knows that MySQL
351
351
or InnoDB cannot meanwhile change the info printed here. */
352
352
 
353
353
void
469
469
        unsigned        active_trans:2; /* 1 - if a transaction in MySQL
470
470
                                        is active. 2 - if prepare_commit_mutex
471
471
                                        was taken */
472
 
        void*           mysql_thd;      /* MySQL thread handle corresponding
 
472
        void*           mysql_session;  /* MySQL thread handle corresponding
473
473
                                        to this trx, or NULL */
474
 
        char**          mysql_query_str;/* pointer to the field in mysqld_thd
 
474
        char**          mysql_query_str;/* pointer to the field in mysqld_session
475
475
                                        which contains the pointer to the
476
476
                                        current SQL query string */
477
477
        const char*     mysql_log_file_name;