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

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

Merge moksha.local:/Users/davi/mysql/push/bugs/28587-5.0
into moksha.local:/Users/davi/mysql/push/bugs/28587-5.1
11830073 · davi@moksha.local · 7ed3555c · 1180c22a · 11830073
Commit 11830073 authored Aug 30, 2007 by davi@moksha.local
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_insert.cc sql/sql_insert.cc +1 -1

No files found.
--- a/sql/sql_insert.cc
+++ b/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;
  }