Merge moksha.local:/Users/davi/mysql/push/bugs/28587-5.0

into  moksha.local:/Users/davi/mysql/push/bugs/28587-5.1


sql/sql_insert.cc:
  Auto merged

sql/sql_insert.cc

@@ -397,7 +397,7 @@ void upgrade_lock_type(THD *thd, thr_lock_type *lock_type,
   if (duplic == DUP_UPDATE ||
       duplic == DUP_REPLACE && *lock_type == TL_WRITE_CONCURRENT_INSERT)
   {
-    *lock_type= TL_WRITE;
+    *lock_type= TL_WRITE_DEFAULT;
     return;
   }