Author: paul
Date: 2006-03-14 17:49:10 +0100 (Tue, 14 Mar 2006)
New Revision: 1573
Log:
r3877@kite-hub: paul | 2006-03-14 10:40:32 -0600
Update error messages
Modified:
trunk/
trunk/make.d/vars-docbook
trunk/make.d/vars-layout
trunk/make.d/xml-valid
trunk/refman-5.1/errmsgs-server.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8644
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3817
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8644
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3877
Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook 2006-03-14 14:21:26 UTC (rev 1572)
+++ trunk/make.d/vars-docbook 2006-03-14 16:49:10 UTC (rev 1573)
@@ -12,8 +12,18 @@
# environment variable to point to a catalog file that provides pathnames
# that are correct for your system.
+# Set XML_CATLOG_FILES only if not already set in environment
+
+ifneq ($(origin XML_CATALOG_FILES), environment)
+XML_CATALOG_FILES = $(REPO_ROOT)/catalog.xml
+endif
+
DOCBOOK_XSL = mysqldoc://xsl-current
+# XML validator
+
+XMLLINT = XML_CATALOG_FILES="$(XML_CATALOG_FILES)" xmllint
+
# XSLT processor:
# --xinclude: The input might be split among several files
# --novalid: None of the transformation targets require validation (we assume
@@ -23,7 +33,7 @@
# the chapterfmt.pl script to set the rootid parameter that tells xsltproc
# to format a single chapter.
-XSLTPROC = xsltproc --xinclude --novalid $(XSLTPROC_EXTRA_FLAGS)
+XSLTPROC = XML_CATALOG_FILES="$(XML_CATALOG_FILES)" xsltproc --xinclude --novalid $(XSLTPROC_EXTRA_FLAGS)
# ----------------------------------------------------------------------
# These variables can be overridden by setting them in the Makefile
Modified: trunk/make.d/vars-layout
===================================================================
--- trunk/make.d/vars-layout 2006-03-14 14:21:26 UTC (rev 1572)
+++ trunk/make.d/vars-layout 2006-03-14 16:49:10 UTC (rev 1573)
@@ -2,7 +2,10 @@
# Requirement: REPO_ROOT must be set by the parent Makefile.
-# Location of directory containing XSL stylesheets
+# Location of directory containing DocBook DTD and XSL stylesheet files
+DBK_DIR = $(REPO_ROOT)/dbk.d
+
+# Location of directory containing local XSL stylesheets
XSL_DIR = $(REPO_ROOT)/xsl.d
# Location of "tools" directory
Modified: trunk/make.d/xml-valid
===================================================================
--- trunk/make.d/xml-valid 2006-03-14 14:21:26 UTC (rev 1572)
+++ trunk/make.d/xml-valid 2006-03-14 16:49:10 UTC (rev 1573)
@@ -1,4 +1,4 @@
# Validate an XML document
%.valid: %.xml
- xmllint --xinclude --postvalid --noout --nonet $<
+ $(XMLLINT) --xinclude --postvalid --noout --nonet $<
Modified: trunk/refman-5.1/errmsgs-server.xml
===================================================================
--- trunk/refman-5.1/errmsgs-server.xml 2006-03-14 14:21:26 UTC (rev 1572)
+++ trunk/refman-5.1/errmsgs-server.xml 2006-03-14 16:49:10 UTC (rev 1573)
@@ -6196,5 +6196,16 @@
</para>
</listitem>
+ <listitem>
+ <para>
+ Error: <literal>1545</literal> SQLSTATE: <literal>HY000</literal>
+ (<literal>ER_PARTITION_NO_TEMPORARY</literal>)
+ </para>
+
+ <para>
+ Message: Cannot create temporary table with partitions
+ </para>
+ </listitem>
+
</itemizedlist>
<!-- END_OF_SERVER_ERROR_INFO -->
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1573 - in trunk: . make.d refman-5.1 | paul | 14 Mar |
