← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2010-10-24 01:44:25 UTC
  • mfrom: (1874.1.2 catalogs)
  • Revision ID: brian@tangent.org-20101024014425-exsst7015tqgbw7x
Table encapsulate merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
2125
2125
              DRIZZLE_YYABORT;
2126
2126
            lex->col_list.empty();
2127
2127
            lex->select_lex.init_order();
2128
 
            lex->select_lex.db=
2129
 
              ((TableList*) lex->select_lex.table_list.first)->db;
 
2128
            lex->select_lex.db= const_cast<char *>(((TableList*) lex->select_lex.table_list.first)->getSchemaName());
2130
2129
            statement->alter_info.build_method= $2;
2131
2130
          }
2132
2131
          alter_commands
5821
5820
          {
5822
5821
            TableList *table=
5823
5822
              reinterpret_cast<TableList*>(Lex->current_select->table_list.first);
5824
 
            if (my_strcasecmp(table_alias_charset, $1.str, table->db))
 
5823
            if (my_strcasecmp(table_alias_charset, $1.str, table->getSchemaName()))
5825
5824
            {
5826
5825
              my_error(ER_WRONG_DB_NAME, MYF(0), $1.str);
5827
5826
              DRIZZLE_YYABORT;
5828
5827
            }
5829
5828
            if (my_strcasecmp(table_alias_charset, $3.str,
5830
 
                              table->table_name))
 
5829
                              table->getTableName()))
5831
5830
            {
5832
5831
              my_error(ER_WRONG_TABLE_NAME, MYF(0), $3.str);
5833
5832
              DRIZZLE_YYABORT;