diff options
author | unknown <monty@work.mysql.com> | 2001-09-17 23:26:00 +0200 |
---|---|---|
committer | unknown <monty@work.mysql.com> | 2001-09-17 23:26:00 +0200 |
commit | d8ae9669cd11f9c61105a9cbf19f9318a0e783fc (patch) | |
tree | a544afdc5cdc3dba7918f6a0d8f1341a2fe74ff2 /Docs | |
parent | 9f939ecce6ccf73c5192d721d826f0a2a58a9b3e (diff) | |
parent | 9d62e4a05b1c8399787b624a90e0cab0aa42c57c (diff) | |
download | mariadb-git-d8ae9669cd11f9c61105a9cbf19f9318a0e783fc.tar.gz |
merge
Docs/manual.texi:
Auto merged
extra/perror.c:
Auto merged
include/my_base.h:
Auto merged
include/mysql.h:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
client/mysqltest.c:
Auto merged
Diffstat (limited to 'Docs')
-rw-r--r-- | Docs/manual.texi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index f7cb934e7dd..df0b8ccf989 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -47117,6 +47117,9 @@ not yet 100% confident in this code. @appendixsubsec Changes in release 3.23.43 @itemize @bullet @item +Added unique error message when one gets a DEADLOCK during a transaction with +BDB tables. +@item Fixed problem with @code{BDB} tables and @code{UNIQUE} columns defined as @code{NULL}. @item |