diff --git a/Docs/manual.texi b/Docs/manual.texi
index 7e4e734e68766b0f6d0150994303f6414fec4294..999bb67250bbeabf75be7ab52209131e9aacd664 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -595,7 +595,7 @@ Replication in MySQL
* Replication Options:: Replication Options in my.cnf
* Replication SQL:: SQL Commands related to replication
* Replication FAQ:: Frequently Asked Questions about replication
-* Troubleshooting Replication:: Troubleshooting Replication. Troubleshooting Replication. Troubleshooting Replication
+* Troubleshooting Replication:: Troubleshooting Replication. Troubleshooting Replication. Troubleshooting Replication. Troubleshooting Replication
Getting Maximum Performance from MySQL
@@ -895,6 +895,7 @@ Changes in release 4.0.x (Development; Alpha)
Changes in release 3.23.x (Stable)
+* News-3.23.34a::
* News-3.23.34:: Changes in release 3.23.34
* News-3.23.33:: Changes in release 3.23.33
* News-3.23.32:: Changes in release 3.23.32
@@ -23666,7 +23667,7 @@ NuSphere is working on removing these limitations.
@subsection INNOBASE Tables overview
Innobase is included in the @strong{MySQL} source distribution starting
-from 3.23.34 and will be activated in the @strong{MySQL}-max binary.
+from 3.23.34a and will be activated in the @strong{MySQL}-max binary.
If you have downloaded a binary version of @strong{MySQL} that includes
support for Innobase, simply follow the instructions for
@@ -26616,7 +26617,7 @@ tables}.
* Replication Options:: Replication Options in my.cnf
* Replication SQL:: SQL Commands related to replication
* Replication FAQ:: Frequently Asked Questions about replication
-* Troubleshooting Replication:: Troubleshooting Replication. Troubleshooting Replication. Troubleshooting Replication
+* Troubleshooting Replication:: Troubleshooting Replication. Troubleshooting Replication. Troubleshooting Replication. Troubleshooting Replication
@end menu
@node Replication Intro, Replication Implementation, Replication, Replication
@@ -42047,6 +42048,7 @@ users uses this code as the rest of the code and because of this we are
not yet 100 % confident in this code.
@menu
+* News-3.23.34a::
* News-3.23.34:: Changes in release 3.23.34
* News-3.23.33:: Changes in release 3.23.33
* News-3.23.32:: Changes in release 3.23.32
@@ -42084,7 +42086,13 @@ not yet 100 % confident in this code.
* News-3.23.0:: Changes in release 3.23.0
@end menu
-@node News-3.23.34, News-3.23.33, News-3.23.x, News-3.23.x
+@node News-3.23.34a, News-3.23.34, News-3.23.x, News-3.23.x
+@appendixsubsec Changes in release 3.23.34a
+@itemize @bullet
+Add extra files to distribution to allow one to compile Innobase.
+@end itemize
+
+@node News-3.23.34, News-3.23.33, News-3.23.34a, News-3.23.x
@appendixsubsec Changes in release 3.23.34
@itemize @bullet
@item
diff --git a/innobase/mem/Makefile.am b/innobase/mem/Makefile.am
index a81f7564a2a507b3766b700de324f77b834b3a66..84f642e4469754d169c76372efc1a08ed254ffce 100644
--- a/innobase/mem/Makefile.am
+++ b/innobase/mem/Makefile.am
@@ -19,6 +19,8 @@ include ../include/Makefile.i
libs_LIBRARIES = libmem.a
-libmem_a_SOURCES = mem0mem.c mem0pool.c mem0dbg.c
+libmem_a_SOURCES = mem0mem.c mem0pool.c
+
+EXTRA_DIST = mem0dbg.c
EXTRA_PROGRAMS =
diff --git a/innobase/pars/Makefile.am b/innobase/pars/Makefile.am
index 691d5acd06266d987164fb31a4e8f352f452176f..e5611f9dfc68f304eb80e3a8f0c253c4429a7450 100644
--- a/innobase/pars/Makefile.am
+++ b/innobase/pars/Makefile.am
@@ -19,7 +19,7 @@ include ../include/Makefile.i
libs_LIBRARIES = libpars.a
-noninst_HEADERS = pars0grm.h
+noinst_HEADERS = pars0grm.h
libpars_a_SOURCES = pars0grm.c lexyy.c pars0opt.c pars0pars.c pars0sym.c
diff --git a/sql-bench/run-all-tests.sh b/sql-bench/run-all-tests.sh
index cbcafce3117d30f7616e76222ca155b26540d829..31d48c837df8613f08f1fb5aa71e9fe0e69bd74d 100644
--- a/sql-bench/run-all-tests.sh
+++ b/sql-bench/run-all-tests.sh
@@ -36,11 +36,6 @@
use DBI;
$opt_silent=1; # Don't write header
-$prog_args="";
-foreach $arg (@ARGV)
-{
- $prog_args.="'" . $arg . "' ";
-}
chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
@@ -50,6 +45,20 @@ $machine=machine();
$redirect= !($machine =~ /windows/i || $machine =~ "^NT\s") ? "2>&1" : "";
$dir= ($pwd =~ /\\/) ? '\\' : '/'; # directory symbol for shell
+$prog_args="";
+foreach $arg (@ARGV)
+{
+ if ($redirect)
+ {
+ $prog_args.="'" . $arg . "' ";
+ }
+ else
+ {
+ # Windows/NT can't handle ' around arguments
+ $prog_args.=$arg . " ";
+ }
+}
+
$prog_count=$errors=0;
if ($opt_cmp) {