← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.h

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.h
794
794
                             const char *table_name_arg,
795
795
                             enum thr_lock_type lock_type_arg)
796
796
  {
797
 
    bzero((char*) this, sizeof(*this));
 
797
    memset(this, 0, sizeof(*this));
798
798
    db= (char*) db_name_arg;
799
799
    table_name= alias= (char*) table_name_arg;
800
800
    lock_type= lock_type_arg;
1154
1154
{
1155
1155
  struct        st_changed_table_list *next;
1156
1156
  char          *key;
1157
 
  uint32        key_length;
 
1157
  uint32_t        key_length;
1158
1158
} CHANGED_TABLE_LIST;
1159
1159
 
1160
1160
 
1161
1161
typedef struct st_open_table_list{
1162
1162
  struct st_open_table_list *next;
1163
1163
  char  *db,*table;
1164
 
  uint32 in_use,locked;
 
1164
  uint32_t in_use,locked;
1165
1165
} OPEN_TABLE_LIST;
1166
1166
 
1167
1167
typedef struct st_table_field_w_type
1193
1193
 
1194
1194
/* The following is only needed for debugging */
1195
1195
 
1196
 
static inline my_bitmap_map *dbug_tmp_use_all_columns(TABLE *table __attribute__((__unused__)),
1197
 
                                                      MY_BITMAP *bitmap __attribute__((__unused__)))
 
1196
static inline my_bitmap_map *dbug_tmp_use_all_columns(TABLE *table __attribute__((unused)),
 
1197
                                                      MY_BITMAP *bitmap __attribute__((unused)))
1198
1198
{
1199
1199
  return 0;
1200
1200
}
1201
1201
 
1202
 
static inline void dbug_tmp_restore_column_map(MY_BITMAP *bitmap __attribute__((__unused__)),
1203
 
                                               my_bitmap_map *old __attribute__((__unused__)))
 
1202
static inline void dbug_tmp_restore_column_map(MY_BITMAP *bitmap __attribute__((unused)),
 
1203
                                               my_bitmap_map *old __attribute__((unused)))
1204
1204
{
1205
1205
  return;
1206
1206
}