Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/my/mysql-5.0


sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged

1 files changed, 4 insertions, 3 deletions

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 6db7e6a6b18..ce1a669c91e 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -892,9 +892,10 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
       if (info->handle_duplicates == DUP_UPDATE)
       {
         int res= 0;
-        /* we don't check for other UNIQUE keys - the first row
-           that matches, is updated. If update causes a conflict again,
-           an error is returned
+        /*
+          We don't check for other UNIQUE keys - the first row
+          that matches, is updated. If update causes a conflict again,
+          an error is returned
         */
 	DBUG_ASSERT(table->insert_values != NULL);
         store_record(table,insert_values);