← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/srv/srv0srv.c

  • 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/srv/srv0srv.c
988
988
        srv_conc_slot_t*        slot      = NULL;
989
989
        ulint                   i;
990
990
 
991
 
        if (trx->mysql_thd != NULL
992
 
            && thd_is_replication_slave_thread(trx->mysql_thd)) {
 
991
        if (trx->mysql_session != NULL
 
992
            && session_is_replication_slave_thread(trx->mysql_session)) {
993
993
 
994
994
                /* TODO Do something more interesting (based on a config
995
995
                parameter). Some users what to give the replication
1174
1174
                return;
1175
1175
        }
1176
1176
 
1177
 
        if (trx->mysql_thd != NULL
1178
 
            && thd_is_replication_slave_thread(trx->mysql_thd)) {
 
1177
        if (trx->mysql_session != NULL
 
1178
            && session_is_replication_slave_thread(trx->mysql_session)) {
1179
1179
 
1180
1180
                return;
1181
1181
        }