← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2008-08-22 15:37:17 UTC
  • mfrom: (365.2.9 codestyle)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: brian@tangent.org-20080822153717-kqyxqh0xcnvfjrzh
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
143
143
      assigned.  No arithmetic is done on the value: it will be
144
144
      overwritten with a value taken from DRIZZLE_BIN_LOG.
145
145
    */
146
 
    share->table_map_version= ~(uint64_t)0;
 
146
    share->table_map_version= UINT64_MAX;
147
147
 
148
148
    /*
149
149
      Since alloc_table_share() can be called without any locking (for
152
152
      elsewhere, and then assign a table map id inside open_table()
153
153
      under the protection of the LOCK_open mutex.
154
154
    */
155
 
    share->table_map_id= ~0UL;
 
155
    share->table_map_id= UINT32_MAX;
156
156
    share->cached_row_logging_check= -1;
157
157
 
158
158
    memcpy(&share->mem_root, &mem_root, sizeof(mem_root));
4666
4666
 
4667
4667
uint Table::find_shortest_key(const key_map *usable_keys)
4668
4668
{
4669
 
  uint min_length= (uint) ~0;
4670
 
  uint best= MAX_KEY;
 
4669
  uint32_t min_length= UINT32_MAX;
 
4670
  uint32_t best= MAX_KEY;
4671
4671
  if (!usable_keys->is_clear_all())
4672
4672
  {
4673
4673
    for (uint nr=0; nr < s->keys ; nr++)