← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2009-08-17 15:34:55 UTC
  • mto: (1117.1.9 merge)
  • mto: This revision was merged to the branch mainline in revision 1118.
  • Revision ID: brian@gaz-20090817153455-emrlqx6cbxo9knfm
Fix for Stewart's patch (includes hack to solve MAX rows problem).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
665
665
    create_info.default_table_charset= get_default_db_collation(session->db);
666
666
 
667
667
    res= mysql_alter_table(session, first_table->db, first_table->table_name,
668
 
                           &create_info, first_table, &alter_info,
 
668
                           &create_info, lex->create_table_proto, first_table,
 
669
                           &alter_info,
669
670
                           0, (order_st*) 0, 0);
670
671
    break;
671
672
  }
716
717
 
717
718
      res= mysql_alter_table(session, select_lex->db, lex->name.str,
718
719
                             &create_info,
 
720
                             lex->create_table_proto,
719
721
                             first_table,
720
722
                             &alter_info,
721
723
                             select_lex->order_list.elements,