Merge paul@work.mysql.com:/home/bk/mysql

into central.snake.net:/usr/users/paul/mysql


BitKeeper/etc/logging_ok:
  Auto merged
Docs/manual.texi:
  Auto merged

BitKeeper/etc/logging_ok

+bk@work.mysql.com
+davida@work.mysql.com
+jamppa@work.mysql.com
+jcole@ham.spaceapes.com
+jcole@jcole.burghcom.com
+jcole@tetra.bedford.progress.com
+jcole@tetra.spaceapes.com
+matt@work.mysql.com
+monty@donna.mysql.com
+monty@work.mysql.com
 paul@central.snake.net
+paul@work.mysql.com
+sasha@mysql.sashanet.com
+sasha@work.mysql.com
+serg@infomag.ape.relarn.ru
+serg@work.mysql.com
+sinisa@work.mysql.com
+tim@localhost.polyesthetic.msg
+tim@work.mysql.com
+tonu@work.mysql.com

Build-tools/Do-all-build-steps

@@ -26,7 +26,7 @@ cd "$WD"
 # Create a build directory tree
 bk export $BD
 cd "$BD"
-chmod -R a+rw,g+rw .
+chmod -R u+rw,g+rw .
 
 #Make it easy to remove an old build
 umask 002

Build-tools/Do-compile

@@ -145,7 +145,7 @@ if ($opt_stage <= 5 && !$opt_no_test)
   log_system("./bin/mysqladmin --no-defaults -u root -S $mysql_unix_port -s shutdown") || info("There was no mysqld running\n");
   sleep(2);
   log_system("rm -f  ./data/mysql/*");
-  check_system("scripts/mysql_install_db --skip-locking","com/license");
+  check_system("scripts/mysql_install_db --no-defaults --skip-locking","https://order");
   safe_system("./bin/mysqld --no-defaults --basedir . --datadir ./data --skip-locking >> $log 2>&1 &");
   sleep(2);
 }

Docs/Makefile.am

@@ -66,6 +66,16 @@ manual.pdf: manual.texi
 	rm -f manual-tmp.* ; \
 	touch $@
 
+# Target to produce NuSphere Manual
+print-manual.pdf: manual.texi
+	cat manual.texi | sed -e 's|@image{[^}]*} *||g' > manual-tmp.texi; \
+	pdftex --interaction=nonstopmode '\input manual-tmp.texi'; \
+	pdftex --interaction=nonstopmode '\pdfcompresslevel=9' \
+					 '\input manual-tmp.texi'; \
+	mv manual-tmp.pdf $@; \
+	rm -f manual-tmp.* ; \
+	touch $@
+
 # The texi2dvi gives a lot of harmless errors. Just ignore them unless
 # you want to help with the typesetting part.
 # This is the European papersize version

scripts/make_binary_distribution.sh

@@ -48,7 +48,7 @@ rm $BASE/include/Makefile*; rm $BASE/include/*.in
 
 cp -p tests/*.res tests/*.tst tests/*.pl $BASE/tests
 cp -p support-files/* $BASE/support-files
-cp -p libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_a.a libmysql_r/.libs/libmysqlclient.so* libmysql_r/libmysqlclient.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a $BASE/lib
+cp -p libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a $BASE/lib
 cp -r -p sql/share/* $BASE/share/mysql; rm -f $BASE/share/mysql/Makefile* $BASE/share/mysql/*/*.OLD $BASE/share/CVS $BASE/share/*/CVS 
 
 cp -p scripts/* $BASE/bin

scripts/mysql_install_db.sh

@@ -25,7 +25,7 @@ do
                 ;;
        --force) force=1
                 ;;
-       --no-defaults=*)   defaults="$1"; CONFIG_FILES=/nonexistent
+       --no-defaults)     defaults="$1"; CONFIG_FILES=/nonexistent
                 ;;
        --defaults-file=*) defaults="$1"; CONFIG_FILES="$eqvalue"
                 ;;