← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Jay Pipes
  • Date: 2008-08-01 03:28:12 UTC
  • mto: (264.1.6 codestyle)
  • mto: This revision was merged to the branch mainline in revision 247.
  • Revision ID: jay@mysql.com-20080801032812-8gl0ukak1qcgfyyt
removed view_store_options() function - wasn't used anywhere.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
22
22
  Drizzle has a different form of DELAYED then MySQL. DELAYED is just
23
23
  a hint to the the sorage engine (which can then do whatever it likes.
24
24
*/
25
 
#include <drizzled/server_includes.h>
26
 
#include <drizzled/sql_select.h>
27
 
#include <drizzled/sql_show.h>
 
25
 
 
26
#include "mysql_priv.h"
 
27
#include "sql_select.h"
 
28
#include "sql_show.h"
 
29
#include "slave.h"
28
30
#include "rpl_mi.h"
29
 
#include <drizzled/drizzled_error_messages.h>
30
31
 
31
32
/* Define to force use of my_malloc() if the allocated memory block is big */
32
33
 
330
331
  /*
331
332
    Fill in the given fields and dump it to the table file
332
333
  */
333
 
  memset(&info, 0, sizeof(info));
 
334
  memset((char*) &info, 0, sizeof(info));
334
335
  info.ignore= ignore;
335
336
  info.handle_duplicates=duplic;
336
337
  info.update_fields= &update_fields;
1053
1054
        view= test(0);
1054
1055
      }
1055
1056
      {
1056
 
        push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
1057
        push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
1057
1058
                            ER_NO_DEFAULT_FOR_FIELD,
1058
1059
                            ER(ER_NO_DEFAULT_FOR_FIELD),
1059
1060
                            (*field)->field_name);
1142
1143
   autoinc_value_of_last_inserted_row(0),
1143
1144
   insert_into_view(table_list_par && 0 != 0)
1144
1145
{
1145
 
  memset(&info, 0, sizeof(info));
 
1146
  memset((char*) &info, 0, sizeof(info));
1146
1147
  info.handle_duplicates= duplic;
1147
1148
  info.ignore= ignore_check_option_errors;
1148
1149
  info.update_fields= update_fields;
1592
1593
    if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS)
1593
1594
    {
1594
1595
      create_info->table_existed= 1;            // Mark that table existed
1595
 
      push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
 
1596
      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
1596
1597
                          ER_TABLE_EXISTS_ERROR, ER(ER_TABLE_EXISTS_ERROR),
1597
1598
                          create_table->table_name);
1598
1599
      return(create_table->table);
1612
1613
  tmp_table.s->db_low_byte_first= 
1613
1614
        test(create_info->db_type == myisam_hton ||
1614
1615
             create_info->db_type == heap_hton);
1615
 
  tmp_table.null_row= false;
1616
 
  tmp_table.maybe_null= false;
 
1616
  tmp_table.null_row=tmp_table.maybe_null=0;
1617
1617
 
1618
1618
  while ((item=it++))
1619
1619
  {