~ubuntu-branches/ubuntu/precise/mysql-5.1/precise

« back to all changes in this revision

Viewing changes to storage/innodb_plugin/handler/handler0alter.cc

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-21 15:31:05 UTC
  • mfrom: (1.1.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 6.
  • Revision ID: james.westby@ubuntu.com-20100621153105-pbbz3t6nyrf9t2zq
Tags: upstream-5.1.48
ImportĀ upstreamĀ versionĀ 5.1.48

Show diffs side-by-side

added added

removed removed

Lines of Context:
894
894
                prebuilt->trx->error_info = NULL;
895
895
                /* fall through */
896
896
        default:
 
897
                trx->error_state = DB_SUCCESS;
 
898
 
897
899
                if (new_primary) {
898
900
                        if (indexed_table != innodb_table) {
899
901
                                row_merge_drop_table(trx, indexed_table);