Commit 0ea12179 authored by antony@anubis.xiphis.org's avatar antony@anubis.xiphis.org
Browse files

Merge anubis.xiphis.org:/usr/home/antony/work/p2-bug25511.5 

into  anubis.xiphis.org:/usr/home/antony/work/p2-bug25513.5
parents fc241de3 68af862c

include/my_base.h

+2 −3
Original line number Diff line number Diff line
@@ -170,9 +170,8 @@ enum ha_extra_function { 
  HA_EXTRA_DELETE_CANNOT_BATCH,

  HA_EXTRA_UPDATE_CANNOT_BATCH,

  /*

    Inform handler that write_row() should immediately report constraint

    violations because a INSERT...ON DUPLICATE KEY UPDATE is in being

    performed.

    Inform handler that an "INSERT...ON DUPLICATE KEY UPDATE" will be

    executed. This condition is unset by HA_EXTRA_NO_IGNORE_DUP_KEY.

  */

  HA_EXTRA_INSERT_WITH_UPDATE

};

sql/ha_federated.cc

+4 −0
Original line number Diff line number Diff line
@@ -2727,6 +2727,10 @@ int ha_federated::extra(ha_extra_function operation) 
    replace_duplicates= TRUE;

    break;

  case HA_EXTRA_WRITE_CANNOT_REPLACE:

    /*

      We use this flag to ensure that we do not create an "INSERT IGNORE"

      statement when inserting new rows into the remote table.

    */

    replace_duplicates= FALSE;

    break;

  case HA_EXTRA_INSERT_WITH_UPDATE: