summaryrefslogtreecommitdiff
path: root/storage/innodb_plugin/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innodb_plugin/ChangeLog')
-rw-r--r--storage/innodb_plugin/ChangeLog19
1 files changed, 18 insertions, 1 deletions
diff --git a/storage/innodb_plugin/ChangeLog b/storage/innodb_plugin/ChangeLog
index 43f87a1baf5..c185215e65f 100644
--- a/storage/innodb_plugin/ChangeLog
+++ b/storage/innodb_plugin/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-11 The InnoDB Team
+ * row/row0sel.c
+ Fix Bug #57345 btr_pcur_store_position abort for load with
+ concurrent lock/unlock tables
+
+2010-10-06 The InnoDB Team
+ * row/row0mysql.c, innodb_bug57255.result, innodb_bug57255.test
+ Fix Bug #Cascade Delete results in "Got error -1 from storage engine"
+
+2010-09-27 The InnoDB Team
+
+ * row/row0sel.c, innodb_bug56716.result, innodb_bug56716.test:
+ Fix Bug #56716 InnoDB locks a record gap without locking the table
+
+2010-09-06 The InnoDB Team
+ * dict/dict0load.c, innodb_bug53756.test innodb_bug53756.result
+ Fix Bug #53756 ALTER TABLE ADD PRIMARY KEY affects crash recovery
+
2010-08-24 The InnoDB Team
* handler/ha_innodb.c, dict/dict0dict.c:
@@ -27,7 +45,6 @@
* handler/ha_innodb.cc
Fix Bug #55382 Assignment with SELECT expressions takes unexpected
S locks in READ COMMITTED
->>>>>>> MERGE-SOURCE
2010-07-27 The InnoDB Team