← 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: 2010-08-19 16:45:03 UTC
  • mfrom: (1711.6.11 staging)
  • Revision ID: brian@tangent.org-20100819164503-t7rhibp5s7bv3dtu
Merge of signals, plus build fix for FreeBSD. Also contains memset/constructor patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
196
196
  memset(quick_n_ranges, 0, sizeof(unsigned int) * MAX_KEY);
197
197
 
198
198
  memory::init_sql_alloc(&mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
199
 
  memset(&sort, 0, sizeof(filesort_info_st));
200
199
}
201
200
 
202
201
 
1622
1621
  {                                             // Get keys for ni_create
1623
1622
    bool using_unique_constraint= false;
1624
1623
    HA_KEYSEG *seg= (HA_KEYSEG*) this->mem_root.alloc_root(sizeof(*seg) * keyinfo->key_parts);
1625
 
    if (!seg)
1626
 
      goto err;
 
1624
    if (not seg)
 
1625
      return true;
1627
1626
 
1628
1627
    memset(seg, 0, sizeof(*seg) * keyinfo->key_parts);
1629
1628
    if (keyinfo->key_length >= cursor->getEngine()->max_key_length() ||
1689
1688
    }
1690
1689
  }
1691
1690
  MI_CREATE_INFO create_info;
1692
 
  memset(&create_info, 0, sizeof(create_info));
1693
1691
 
1694
1692
  if ((options & (OPTION_BIG_TABLES | SELECT_SMALL_RESULT)) ==
1695
1693
      OPTION_BIG_TABLES)
1696
1694
    create_info.data_file_length= ~(uint64_t) 0;
1697
1695
 
1698
 
  if ((error=mi_create(share->getTableName(), share->sizeKeys(), &keydef,
1699
 
                       (uint32_t) (*recinfo-start_recinfo),
1700
 
                       start_recinfo,
1701
 
                       share->uniques, &uniquedef,
1702
 
                       &create_info,
1703
 
                       HA_CREATE_TMP_TABLE)))
 
1696
  if ((error= mi_create(share->getTableName(), share->sizeKeys(), &keydef,
 
1697
                        (uint32_t) (*recinfo-start_recinfo),
 
1698
                        start_recinfo,
 
1699
                        share->uniques, &uniquedef,
 
1700
                        &create_info,
 
1701
                        HA_CREATE_TMP_TABLE)))
1704
1702
  {
1705
1703
    print_error(error, MYF(0));
1706
1704
    db_stat= 0;
1707
 
    goto err;
 
1705
 
 
1706
    return true;
1708
1707
  }
1709
1708
  in_use->status_var.created_tmp_disk_tables++;
1710
1709
  share->db_record_offset= 1;
1711
1710
  return false;
1712
 
 err:
1713
 
  return true;
1714
1711
}
1715
1712
 
1716
1713
 
1944
1941
 
1945
1942
  memset(quick_key_parts, 0, sizeof(unsigned int) * MAX_KEY);
1946
1943
  memset(quick_n_ranges, 0, sizeof(unsigned int) * MAX_KEY);
1947
 
 
1948
 
  memset(&mem_root, 0, sizeof(memory::Root));
1949
 
  memset(&sort, 0, sizeof(filesort_info_st));
1950
1944
}
1951
1945
 
1952
1946
/*****************************************************************************