← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
65
65
static int check_insert_fields(THD *thd, TABLE_LIST *table_list,
66
66
                               List<Item> &fields, List<Item> &values,
67
67
                               bool check_unique,
68
 
                               table_map *map __attribute__((__unused__)))
 
68
                               table_map *map __attribute__((unused)))
69
69
{
70
70
  TABLE *table= table_list->table;
71
71
 
160
160
 
161
161
static int check_update_fields(THD *thd, TABLE_LIST *insert_table_list,
162
162
                               List<Item> &update_fields,
163
 
                               table_map *map __attribute__((__unused__)))
 
163
                               table_map *map __attribute__((unused)))
164
164
{
165
165
  TABLE *table= insert_table_list->table;
166
166
  bool timestamp_mark= false;
203
203
*/
204
204
 
205
205
static
206
 
void upgrade_lock_type(THD *thd __attribute__((__unused__)),
 
206
void upgrade_lock_type(THD *thd __attribute__((unused)),
207
207
                       thr_lock_type *lock_type,
208
208
                       enum_duplicates duplic,
209
 
                       bool is_multi_insert __attribute__((__unused__)))
 
209
                       bool is_multi_insert __attribute__((unused)))
210
210
{
211
211
  if (duplic == DUP_UPDATE ||
212
212
      (duplic == DUP_REPLACE && *lock_type == TL_WRITE_CONCURRENT_INSERT))
331
331
  /*
332
332
    Fill in the given fields and dump it to the table file
333
333
  */
334
 
  bzero((char*) &info,sizeof(info));
 
334
  memset((char*) &info, 0, sizeof(info));
335
335
  info.ignore= ignore;
336
336
  info.handle_duplicates=duplic;
337
337
  info.update_fields= &update_fields;
583
583
*/
584
584
 
585
585
static bool mysql_prepare_insert_check_table(THD *thd, TABLE_LIST *table_list,
586
 
                                             List<Item> &fields __attribute__((__unused__)),
 
586
                                             List<Item> &fields __attribute__((unused)),
587
587
                                             bool select_insert)
588
588
{
589
589
  
641
641
                          TABLE *table, List<Item> &fields, List_item *values,
642
642
                          List<Item> &update_fields, List<Item> &update_values,
643
643
                          enum_duplicates duplic,
644
 
                          COND **where __attribute__((__unused__)),
 
644
                          COND **where __attribute__((unused)),
645
645
                          bool select_insert,
646
646
                          bool check_fields, bool abort_on_warning)
647
647
{
1045
1045
  {
1046
1046
    if (!bitmap_is_set(write_set, (*field)->field_index) &&
1047
1047
        ((*field)->flags & NO_DEFAULT_VALUE_FLAG) &&
1048
 
        ((*field)->real_type() != MYSQL_TYPE_ENUM))
 
1048
        ((*field)->real_type() != DRIZZLE_TYPE_ENUM))
1049
1049
    {
1050
1050
      bool view= false;
1051
1051
      if (table_list)
1143
1143
   autoinc_value_of_last_inserted_row(0),
1144
1144
   insert_into_view(table_list_par && 0 != 0)
1145
1145
{
1146
 
  bzero((char*) &info,sizeof(info));
 
1146
  memset((char*) &info, 0, sizeof(info));
1147
1147
  info.handle_duplicates= duplic;
1148
1148
  info.ignore= ignore_check_option_errors;
1149
1149
  info.update_fields= update_fields;