← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/table.h

  • Committer: Brian Aker
  • Date: 2008-07-06 07:56:50 UTC
  • mfrom: (53.2.38 codestyle)
  • Revision ID: brian@tangent.org-20080706075650-17hslbw06ggz9zb0
Resolved merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/table.h
1196
1196
 
1197
1197
/* The following is only needed for debugging */
1198
1198
 
1199
 
static inline my_bitmap_map *dbug_tmp_use_all_columns(TABLE *table,
1200
 
                                                      MY_BITMAP *bitmap)
 
1199
static inline my_bitmap_map *dbug_tmp_use_all_columns(TABLE *table __attribute__((__unused__)),
 
1200
                                                      MY_BITMAP *bitmap __attribute__((__unused__)))
1201
1201
{
1202
 
#ifndef DBUG_OFF
1203
 
  return tmp_use_all_columns(table, bitmap);
1204
 
#else
1205
1202
  return 0;
1206
 
#endif
1207
1203
}
1208
1204
 
1209
 
static inline void dbug_tmp_restore_column_map(MY_BITMAP *bitmap,
1210
 
                                               my_bitmap_map *old)
 
1205
static inline void dbug_tmp_restore_column_map(MY_BITMAP *bitmap __attribute__((__unused__)),
 
1206
                                               my_bitmap_map *old __attribute__((__unused__)))
1211
1207
{
1212
 
#ifndef DBUG_OFF
1213
 
  tmp_restore_column_map(bitmap, old);
1214
 
#endif
 
1208
  return;
1215
1209
}
1216
1210
 
1217
1211
size_t max_row_length(TABLE *table, const uchar *data);