Merge arjen@work.mysql.com:/home/bk/mysql-4.0

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0

.bzrignore

@@ -458,3 +458,4 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
+Docs/mysql.xml

Docs/Support/docbook-fixup.pl

@@ -37,6 +37,11 @@ print STDERR "Fixing spacing problem with titles...\n";
 $data =~ s{</(\w+)>(\w{2,})}
           {</$1> $2}gs;
 
+# 2002-01-30 arjen@mysql.com
+print STDERR "Removing COLSPEC...\n";
+$data =~ s{\n *<colspec colwidth=\"[0-9]+\*\">}
+          {}gs;
+
 @apx = ("Users", "MySQL Testimonials", "News",
         "GPL-license", "LGPL-license");
 

Docs/Support/make-docbook

+#!/bin/sh
+# 2002-01-30 arjen@mysql.com
+# Use this to create mysql.xml (the DocBook XML format output of manual.texi)
+# Requires makeinfo 4.0c
+
+#create include.texi with version/port #
+        echo "@c This file is autogenerated by the Makefile" > include.texi
+        echo -n "@set mysql_version " >> include.texi
+        grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \
+         sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> include.texi
+        echo -n "@set default_port " >> include.texi
+        grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \
+         sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> include.texi
+
+# produce DocBook XML
+        makeinfo --force --no-ifinfo --docbook manual.texi
+        mv mysql.xml mysql-tmp.xml
+        Support/docbook-fixup.pl <mysql-tmp.xml >mysql.xml
+        rm -f mysql-tmp.xml