Merge

0b470dd3 · monty@donna.mysql.com · af307c74 · fffc9bd2 · 0b470dd3 · 0b470dd3
Commit 0b470dd3 authored Jan 29, 2001 by monty@donna.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

.bzrignore .bzrignore +1 -0

Docs/manual.texi Docs/manual.texi +3 -3

No files found.
--- a/.bzrignore
+++ b/.bzrignore
@@ -189,3 +189,4 @@ tmp/*
 extra/resolve_stack_dump
 sql/share/*.sys
 BitKeeper/tmp/bkr3sAHD
+BitKeeper/tmp/*
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -40942,12 +40942,12 @@ a group function, like
 @code{SELECT a,DISTINCT SEC_TO_TIME(sum(a)) from table_name GROUP BY a,b}.
 @item
 Fixed bug in handling @code{STOP} event after @code{ROTATE} event in
-replication
+replication.
 @item
-Fixed another buffer overrun in @code{DROP DATABASE}
+Fixed another buffer overrun in @code{DROP DATABASE}.
 @item
 Added @code{Table_locks_immediate} and @code{Table_locks_waited} status
-variables
+variables.
 @item
 Fixed bug in replication that broke slave server start with existing
 @code{master.info}. This fixes a bug introduced in 3.23.32.