← 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-03-02 07:03:12 UTC
  • mfrom: (1309.2.10 drizzle-build)
  • Revision ID: brian@gaz-20100302070312-u8xyk09u2970pgzp
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/data_dictionary.cc
74
74
     clear it.  We could introduce mutex protection, but it
75
75
     could cause a measureable performance hit in
76
76
     page0zip.c. */
77
 
  push(zip_stat->compressed);
78
 
  push(zip_stat->compressed_ok);
 
77
  push(static_cast<uint64_t>(zip_stat->compressed));
 
78
  push(static_cast<uint64_t>(zip_stat->compressed_ok));
79
79
  push(zip_stat->compressed_usec / 1000000);
80
 
  push(zip_stat->decompressed);
 
80
  push(static_cast<uint64_t>(zip_stat->decompressed));
81
81
  push(zip_stat->decompressed_usec / 1000000);
82
82
 
83
83
  if (inner_reset)
128
128
  buf_buddy_stat_t* buddy_stat = &buf_buddy_stat[record_number];
129
129
 
130
130
  push(static_cast<uint64_t>(BUF_BUDDY_LOW << record_number));
131
 
  push(buddy_stat->used);
132
 
  push(UNIV_LIKELY(record_number < BUF_BUDDY_SIZES) 
133
 
                   ? UT_LIST_GET_LEN(buf_pool->zip_free[record_number]) : 0);
 
131
  push(static_cast<uint64_t>(buddy_stat->used));
 
132
  uint64_t pages_free= (UNIV_LIKELY(record_number < BUF_BUDDY_SIZES) ? UT_LIST_GET_LEN(buf_pool->zip_free[record_number]) : 0);
 
133
  push(pages_free);
134
134
 
135
135
  push(buddy_stat->relocated);
136
136
  push(buddy_stat->relocated_usec / 1000000);
298
298
     push("");
299
299
   }   
300
300
 
301
 
   push(row->lock_space);
302
 
   push(row->lock_page); 
303
 
   push(row->lock_rec);
 
301
   push(static_cast<uint64_t>(row->lock_space));
 
302
   push(static_cast<uint64_t>(row->lock_page)); 
 
303
   push(static_cast<uint64_t>(row->lock_rec));
304
304
   push(row->lock_data);
305
305
}
306
306
 
316
316
 
317
317
    push(trx_id);
318
318
    push(row->trx_state);
319
 
    push(row->trx_started);
 
319
    push(static_cast<uint64_t>(row->trx_started));
320
320
 
321
321
    if (row->trx_wait_started != 0)
322
322
    {
323
323
      push(trx_i_s_create_lock_id(row->requested_lock_row, lock_id, sizeof(lock_id)));
324
 
      push(row->trx_wait_started);
 
324
      push(static_cast<uint64_t>(row->trx_wait_started));
325
325
    }
326
326
    else
327
327
    {
330
330
    }
331
331
 
332
332
    push(static_cast<int64_t>(row->trx_weight));
333
 
    push(row->trx_mysql_thread_id);
 
333
    push(static_cast<uint64_t>(row->trx_mysql_thread_id));
334
334
    push(row->trx_query);
335
335
}
336
336