← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Brian Aker
  • Date: 2008-08-05 04:10:42 UTC
  • mfrom: (261.2.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: brian@tangent.org-20080805041042-1l4893r3bwy2lxz2
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
332
332
  /*
333
333
    Fill in the given fields and dump it to the table file
334
334
  */
335
 
  memset((char*) &info, 0, sizeof(info));
 
335
  memset(&info, 0, sizeof(info));
336
336
  info.ignore= ignore;
337
337
  info.handle_duplicates=duplic;
338
338
  info.update_fields= &update_fields;
1055
1055
        view= test(0);
1056
1056
      }
1057
1057
      {
1058
 
        push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
1058
        push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
1059
1059
                            ER_NO_DEFAULT_FOR_FIELD,
1060
1060
                            ER(ER_NO_DEFAULT_FOR_FIELD),
1061
1061
                            (*field)->field_name);
1144
1144
   autoinc_value_of_last_inserted_row(0),
1145
1145
   insert_into_view(table_list_par && 0 != 0)
1146
1146
{
1147
 
  memset((char*) &info, 0, sizeof(info));
 
1147
  memset(&info, 0, sizeof(info));
1148
1148
  info.handle_duplicates= duplic;
1149
1149
  info.ignore= ignore_check_option_errors;
1150
1150
  info.update_fields= update_fields;
1594
1594
    if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS)
1595
1595
    {
1596
1596
      create_info->table_existed= 1;            // Mark that table existed
1597
 
      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 
1597
      push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
1598
1598
                          ER_TABLE_EXISTS_ERROR, ER(ER_TABLE_EXISTS_ERROR),
1599
1599
                          create_table->table_name);
1600
1600
      return(create_table->table);