Commit c71bff6d authored by unknown's avatar unknown
Browse files

sql_insert.cc: 

  After merge fix.


sql/sql_insert.cc:
  After merge fix.
parent ca16e703

sql/sql_insert.cc

+12 −16
Original line number Diff line number Diff line
@@ -1262,12 +1262,6 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) 
             compare_record(table))

        {

          info->updated++;

          trg_error= (table->triggers &&

                      table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,

                                                        TRG_ACTION_AFTER,

                                                        TRUE));

          info->copied++;

        }

          /*

            If ON DUP KEY UPDATE updates a row instead of inserting one, it's

            like a regular UPDATE statement: it should not affect the value of a
@@ -1282,6 +1276,8 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) 
          trg_error= (table->triggers &&

                      table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,

                                                        TRG_ACTION_AFTER, TRUE));

          info->copied++;

        }



        goto ok_or_after_trg_err;

      }