← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

Big merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
1333
1333
                      &tables, fields, all_fields, order) ||
1334
1334
          !(sortorder= make_unireg_sortorder(order, &length, NULL)) ||
1335
1335
          (from->sort.found_records= filesort(session, from, sortorder, length,
1336
 
                                              (optimizer::SQL_SELECT *) 0, HA_POS_ERROR,
 
1336
                                              (optimizer::SqlSelect *) 0, HA_POS_ERROR,
1337
1337
                                              1, &examined_rows)) ==
1338
1338
          HA_POS_ERROR)
1339
1339
        goto err;
1342
1342
 
1343
1343
  /* Tell handler that we have values for all columns in the to table */
1344
1344
  to->use_all_columns();
1345
 
  init_read_record(&info, session, from, (optimizer::SQL_SELECT *) 0, 1,1);
 
1345
  init_read_record(&info, session, from, (optimizer::SqlSelect *) 0, 1,1);
1346
1346
  if (ignore)
1347
1347
    to->cursor->extra(HA_EXTRA_IGNORE_DUP_KEY);
1348
1348
  session->row_count= 0;