← 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-11-04 15:39:09 UTC
  • mfrom: (575.1.2 devel)
  • Revision ID: brian@tangent.org-20081104153909-c72hn65udxs1ccal
Merge of Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
52
52
 
53
53
/* Get column name from column hash */
54
54
 
55
 
static unsigned char *get_field_name(Field **buff, size_t *length,
56
 
                             bool not_used __attribute__((unused)))
 
55
static unsigned char *get_field_name(Field **buff, size_t *length, bool)
57
56
{
58
57
  *length= (uint) strlen((*buff)->field_name);
59
58
  return (unsigned char*) (*buff)->field_name;
304
303
   6    Unknown .frm version
305
304
*/
306
305
 
307
 
int open_table_def(Session *session, TABLE_SHARE *share, uint32_t db_flags  __attribute__((unused)))
 
306
int open_table_def(Session *session, TABLE_SHARE *share, uint32_t)
308
307
{
309
308
  int error, table_type;
310
309
  bool error_given;
2519
2518
    that are present in this value, returns the length of the value
2520
2519
*/
2521
2520
uint32_t calculate_key_len(Table *table, uint32_t key,
2522
 
                       const unsigned char *buf __attribute__((unused)),
 
2521
                       const unsigned char *,
2523
2522
                       key_part_map keypart_map)
2524
2523
{
2525
2524
  /* works only with key prefixes */
3565
3564
  true       table
3566
3565
*/
3567
3566
 
3568
 
bool mysql_frm_type(Session *session __attribute__((unused)),
3569
 
                    char *path, enum legacy_db_type *dbt)
 
3567
bool mysql_frm_type(Session *, char *path, enum legacy_db_type *dbt)
3570
3568
{
3571
3569
  File file;
3572
3570
  unsigned char header[10];     /* This should be optimized */
3688
3686
    new_created field
3689
3687
*/
3690
3688
 
3691
 
static Field *create_tmp_field_from_item(Session *session __attribute__((unused)),
 
3689
static Field *create_tmp_field_from_item(Session *,
3692
3690
                                         Item *item, Table *table,
3693
3691
                                         Item ***copy_func, bool modify_item,
3694
3692
                                         uint32_t convert_blob_length)
3812
3810
    new_created field
3813
3811
*/
3814
3812
 
3815
 
Field *create_tmp_field_for_schema(Session *session __attribute__((unused)),
3816
 
                                   Item *item, Table *table)
 
3813
Field *create_tmp_field_for_schema(Session *, Item *item, Table *table)
3817
3814
{
3818
3815
  if (item->field_type() == DRIZZLE_TYPE_VARCHAR)
3819
3816
  {
3862
3859
    new_created field
3863
3860
*/
3864
3861
 
3865
 
Field *create_tmp_field(Session *session, Table *table,Item *item, Item::Type type,
3866
 
                        Item ***copy_func, Field **from_field,
3867
 
                        Field **default_field,
3868
 
                        bool group, bool modify_item,
3869
 
                        bool table_cant_handle_bit_fields __attribute__((unused)),
3870
 
                        bool make_copy_field,
 
3862
Field *create_tmp_field(Session *session, Table *table,Item *item,
 
3863
                        Item::Type type, Item ***copy_func, Field **from_field,
 
3864
                        Field **default_field, bool group, bool modify_item,
 
3865
                        bool, bool make_copy_field,
3871
3866
                        uint32_t convert_blob_length)
3872
3867
{
3873
3868
  Field *result;