summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore6
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--Docs/manual.texi6
3 files changed, 10 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore
index b160b186fba..e49294554cb 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -237,11 +237,15 @@ scripts/safe_mysqld
sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
sql-bench/bench-init.pl
sql-bench/compare-results
+sql-bench/compare-results-all
sql-bench/copy-db
sql-bench/crash-me
+sql-bench/gif/*
+sql-bench/graph-compare-results
sql-bench/output/*
sql-bench/run-all-tests
sql-bench/server-cfg
+sql-bench/template.html
sql-bench/test-ATIS
sql-bench/test-alter-table
sql-bench/test-big-tables
@@ -283,5 +287,3 @@ support-files/mysql.server
support-files/mysql.spec
tags
tmp/*
-sql-bench/gif/*
-sql-bench/graph-compare-results
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 39de42e998d..d5d02afc3d1 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -3,3 +3,4 @@ jani@janikt.pp.saunalahti.fi
monty@tik.mysql.fi
mwagner@evoq.mwagner.org
paul@teton.kitebird.com
+monty@hundin.mysql.fi
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 579f34cd81a..078c09aed12 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -42534,6 +42534,9 @@ For more information on Object Oriented Programming
@uref{http://language.perl.com/info/documentation.html}
@end example
+Note that if you want to use transactions with Perl, you need to have
+@code{Msql-Mysql-modules} version 1.2216 or newer.
+
Installation instructions for @strong{MySQL} Perl support are given in
@ref{Perl support}.
@@ -46234,7 +46237,8 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@itemize @bullet
@item
-Added support for symbolic links to @code{MyISAM} tables.
+Added support for symbolic links to @code{MyISAM} tables. Symlink handling is
+now enabled by default for Windows.
@item
Added @code{SQL_CALC_FOUND_ROWS} and @code{FOUND_ROWS()}. This makes it
possible to know how many rows a query would have returned