← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: brian
  • Date: 2008-08-01 17:27:37 UTC
  • mfrom: (261.1.6 drizzle)
  • Revision ID: brian@localhost.localdomain-20080801172737-v6f9pau23un0bwfl
Merge from Monty

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
    /*
1221
1221
    Don't reset warnings when executing a stored routine.
1222
1222
  */
1223
1223
  if (all_tables || !lex->is_single_level_stmt())
1224
 
    mysql_reset_errors(thd, 0);
 
1224
    drizzle_reset_errors(thd, 0);
1225
1225
 
1226
1226
  if (unlikely(thd->slave_thread))
1227
1227
  {
1350
1350
  case SQLCOM_SHOW_WARNS:
1351
1351
  {
1352
1352
    res= mysqld_show_warnings(thd, (ulong)
1353
 
                              ((1L << (uint) MYSQL_ERROR::WARN_LEVEL_NOTE) |
1354
 
                               (1L << (uint) MYSQL_ERROR::WARN_LEVEL_WARN) |
1355
 
                               (1L << (uint) MYSQL_ERROR::WARN_LEVEL_ERROR)
 
1353
                              ((1L << (uint) DRIZZLE_ERROR::WARN_LEVEL_NOTE) |
 
1354
                               (1L << (uint) DRIZZLE_ERROR::WARN_LEVEL_WARN) |
 
1355
                               (1L << (uint) DRIZZLE_ERROR::WARN_LEVEL_ERROR)
1356
1356
                               ));
1357
1357
    break;
1358
1358
  }
1359
1359
  case SQLCOM_SHOW_ERRORS:
1360
1360
  {
1361
1361
    res= mysqld_show_warnings(thd, (ulong)
1362
 
                              (1L << (uint) MYSQL_ERROR::WARN_LEVEL_ERROR));
 
1362
                              (1L << (uint) DRIZZLE_ERROR::WARN_LEVEL_ERROR));
1363
1363
    break;
1364
1364
  }
1365
1365
  case SQLCOM_SHOW_SLAVE_HOSTS:
1395
1395
    }
1396
1396
    else
1397
1397
    {
1398
 
      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
 
1398
      push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN, 0,
1399
1399
                   "the master info structure does not exist");
1400
1400
      my_ok(thd);
1401
1401
    }
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
      }
1708
1708
 
1709
1709
      /* Don't yet allow changing of symlinks with ALTER TABLE */
1710
1710
      if (create_info.data_file_name)
1711
 
        push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
 
1711
        push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN, 0,
1712
1712
                     "DATA DIRECTORY option ignored");
1713
1713
      if (create_info.index_file_name)
1714
 
        push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
 
1714
        push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN, 0,
1715
1715
                     "INDEX DIRECTORY option ignored");
1716
1716
      create_info.data_file_name= create_info.index_file_name= NULL;
1717
1717
      /* ALTER TABLE ends previous transaction */
2498
2498
        if (((thd->options & OPTION_KEEP_LOG) || 
2499
2499
             thd->transaction.all.modified_non_trans_table) &&
2500
2500
            !thd->slave_thread)
2501
 
          push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
2501
          push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
2502
2502
                       ER_WARNING_NOT_COMPLETE_ROLLBACK,
2503
2503
                       ER(ER_WARNING_NOT_COMPLETE_ROLLBACK));
2504
2504
        my_ok(thd);
2637
2637
        str.length(0);
2638
2638
        thd->lex->unit.print(&str, QT_ORDINARY);
2639
2639
        str.append('\0');
2640
 
        push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 
2640
        push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
2641
2641
                     ER_YES, str.ptr());
2642
2642
      }
2643
2643
      if (res)
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.