Commit 4a88835a authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge

parents bbb8125a 6930e114
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -46937,7 +46937,9 @@ Don't write slave-timeout reconnects to the error log.
@item
Fixed bug with slave net read timeouting
@item
Fixed bug in ALTERing  TABLE of BDB type.
Fixed a core-dump bug with @code{MERGE] tables and @code{MAX()} function.
@item
Fixed bug in @code{ALTER TABLE} with BDB tables.
@item
Fixed bug when logging @code{LOAD DATA INFILE} to binary log with no 
active database.