← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

Merged from Mats.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
165
165
 
166
166
void init_update_queries(void)
167
167
{
168
 
  memset((uchar*) &sql_command_flags, 0, sizeof(sql_command_flags));
 
168
  memset(&sql_command_flags, 0, sizeof(sql_command_flags));
169
169
 
170
170
  sql_command_flags[SQLCOM_CREATE_TABLE]=   CF_CHANGES_DATA;
171
171
  sql_command_flags[SQLCOM_CREATE_INDEX]=   CF_CHANGES_DATA;
726
726
    lex_start(thd);
727
727
 
728
728
    status_var_increment(thd->status_var.com_stat[SQLCOM_SHOW_FIELDS]);
729
 
    memset((char*) &table_list, 0, sizeof(table_list));
 
729
    memset(&table_list, 0, sizeof(table_list));
730
730
    if (thd->copy_db_to(&table_list.db, &table_list.db_length))
731
731
      break;
732
732
    /*
1635
1635
    */
1636
1636
    thd->enable_slow_log= opt_log_slow_admin_statements;
1637
1637
 
1638
 
    memset((char*) &create_info, 0, sizeof(create_info));
 
1638
    memset(&create_info, 0, sizeof(create_info));
1639
1639
    create_info.db_type= 0;
1640
1640
    create_info.row_type= ROW_TYPE_NOT_USED;
1641
1641
    create_info.default_table_charset= thd->variables.collation_database;
1701
1701
 
1702
1702
      { // Rename of table
1703
1703
          TABLE_LIST tmp_table;
1704
 
          memset((char*) &tmp_table, 0, sizeof(tmp_table));
 
1704
          memset(&tmp_table, 0, sizeof(tmp_table));
1705
1705
          tmp_table.table_name= lex->name.str;
1706
1706
          tmp_table.db=select_lex->db;
1707
1707
      }
2713
2713
    return 1;
2714
2714
  if (old_info)
2715
2715
  {                                             // Copy old info from stack
2716
 
    memcpy(lex->yacc_yyss, (uchar*) *yyss, old_info*sizeof(**yyss));
2717
 
    memcpy(lex->yacc_yyvs, (uchar*) *yyvs, old_info*sizeof(**yyvs));
 
2716
    memcpy(lex->yacc_yyss, *yyss, old_info*sizeof(**yyss));
 
2717
    memcpy(lex->yacc_yyvs, *yyvs, old_info*sizeof(**yyvs));
2718
2718
  }
2719
2719
  *yyss=(short*) lex->yacc_yyss;
2720
2720
  *yyvs=(YYSTYPE*) lex->yacc_yyvs;
2892
2892
  lex->sql_command= SQLCOM_SELECT;
2893
2893
  tmp.str= (char*) var_name;
2894
2894
  tmp.length=strlen(var_name);
2895
 
  memset((char*) &null_lex_string.str, 0, sizeof(null_lex_string));
 
2895
  memset(&null_lex_string.str, 0, sizeof(null_lex_string));
2896
2896
  /*
2897
2897
    We set the name of Item to @@session.var_name because that then is used
2898
2898
    as the column name in the output.