bk commit into 5.0 tree (antony:1.2506)

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-29 13:55:16-07:00, antony@stripped +2 -0
  add and amend comments for clarity

  include/my_base.h@stripped, 2007-06-29 13:55:13-07:00, antony@stripped +2 -3
    amend comment for clarity

  sql/ha_federated.cc@stripped, 2007-06-29 13:55:13-07:00, antony@stripped +4 -0
    add comment

diff -Nrup a/include/my_base.h b/include/my_base.h
--- a/include/my_base.h	2007-06-28 13:36:17 -07:00
+++ b/include/my_base.h	2007-06-29 13:55:13 -07:00
@@ -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
 };
diff -Nrup a/sql/ha_federated.cc b/sql/ha_federated.cc
--- a/sql/ha_federated.cc	2007-06-28 13:36:18 -07:00
+++ b/sql/ha_federated.cc	2007-06-29 13:55:13 -07:00
@@ -2555,6 +2555,10 @@ int ha_federated::extra(ha_extra_functio
     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: