MySQL Lists: commits: svn commit - mysqldoc@docsrva: r11893 - in trunk: . administrator dynamic-docs/build-configure dynamic-docs/changelog dynamic-docs/command-optvars dyn...

List:	Commits	« Previous Message Next Message »
From:	martin.brown	Date:	September 27 2008 8:07am
Subject:	svn commit - mysqldoc@docsrva: r11893 - in trunk: . administrator dynamic-docs/build-configure dynamic-docs/changelog dynamic-docs/command-optvars dyn...
View as plain text
Author: mcbrown
Date: 2008-09-27 08:07:31 +0200 (Sat, 27 Sep 2008)
New Revision: 11893

Log:
Updating the catalog and makefiles for the new structure



Modified:
   trunk/Makefile
   trunk/administrator/Makefile
   trunk/catalog.xml
   trunk/dynamic-docs/build-configure/Makefile
   trunk/dynamic-docs/changelog/Makefile
   trunk/dynamic-docs/command-optvars/Makefile
   trunk/dynamic-docs/faq/Makefile
   trunk/dynamic-docs/open-bugs/Makefile
   trunk/dynamic-docs/opsfunctions/Makefile
   trunk/falcon/Makefile
   trunk/gui-common/Makefile
   trunk/guibook/Makefile
   trunk/internals/Makefile
   trunk/migration-toolkit/Makefile
   trunk/mysql/Makefile
   trunk/mysqldoc-guide/Makefile
   trunk/mysqlqb/Makefile
   trunk/mysqltest/Makefile
   trunk/ndbapi/Makefile
   trunk/proto-doc/Makefile
   trunk/query-browser/Makefile
   trunk/quick-guides/Makefile
   trunk/refman-4.1/Makefile
   trunk/refman-4.1/Makefile.depends
   trunk/refman-5.0/Makefile
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.1-maria/Makefile
   trunk/refman-5.1/Makefile
   trunk/refman-5.1/Makefile.depends
   trunk/refman-6.0/Makefile
   trunk/refman-6.0/Makefile.depends
   trunk/refman-common/Makefile
   trunk/sample-data/Makefile
   trunk/sample-data/employee/Makefile
   trunk/sample-data/sakila/Makefile
   trunk/sample-data/world/Makefile
   trunk/topic-guides/Makefile
   trunk/topic-guides/topics-5.0/Makefile
   trunk/topic-guides/topics-5.1/Makefile
   trunk/topic-guides/topics-6.0/Makefile
   trunk/topic-guides/topics-common/Makefile
   trunk/userguide/Makefile
   trunk/workbench/Makefile


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 528 bytes

@@ -5,12 +5,11 @@
 # Location of repository root relative to current directory
 REPO_ROOT = .
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 SUBDIRS = \
 	administrator \
-	arbitrary \
 	falcon \
 	gui-common \
 	guibook \


Modified: trunk/administrator/Makefile
===================================================================
--- trunk/administrator/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/administrator/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 567 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/catalog.xml
===================================================================
--- trunk/catalog.xml	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/catalog.xml	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 528 bytes

@@ -12,9 +12,9 @@
 
 <public
   publicId="-//OASIS//DTD DocBook XML V4.3//EN"
-  uri="dtd.d/docbookx.dtd"/>
+  uri="../mysqldoc-toolset/dtd.d/docbookx.dtd"/>
 <system
   systemId="http://www.oasis-open.org/docbook/xml/4.3b2/docbookx.dtd"
-  uri="dtd.d/docbookx.dtd"/>
+  uri="../mysqldoc-toolset/dtd.d/docbookx.dtd"/>
 
 </catalog>


Modified: trunk/dynamic-docs/build-configure/Makefile
===================================================================
--- trunk/dynamic-docs/build-configure/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/dynamic-docs/build-configure/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 569 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Import standard variables
 


Modified: trunk/dynamic-docs/changelog/Makefile
===================================================================
--- trunk/dynamic-docs/changelog/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/dynamic-docs/changelog/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 606 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Make sure we have IDMap references so that changelog references can be validated
 


Modified: trunk/dynamic-docs/command-optvars/Makefile
===================================================================
--- trunk/dynamic-docs/command-optvars/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/dynamic-docs/command-optvars/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 569 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Import standard variables
 


Modified: trunk/dynamic-docs/faq/Makefile
===================================================================
--- trunk/dynamic-docs/faq/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/dynamic-docs/faq/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 588 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Make sure we have IDMap references so that changelog references can be validated
 


Modified: trunk/dynamic-docs/open-bugs/Makefile
===================================================================
--- trunk/dynamic-docs/open-bugs/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/dynamic-docs/open-bugs/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 606 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Make sure we have IDMap references so that changelog references can be validated
 


Modified: trunk/dynamic-docs/opsfunctions/Makefile
===================================================================
--- trunk/dynamic-docs/opsfunctions/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/dynamic-docs/opsfunctions/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 560 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Import standard variables
 


Modified: trunk/falcon/Makefile
===================================================================
--- trunk/falcon/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/falcon/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 546 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/gui-common/Makefile
===================================================================
--- trunk/gui-common/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/gui-common/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 558 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/guibook/Makefile
===================================================================
--- trunk/guibook/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/guibook/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 549 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/internals/Makefile
===================================================================
--- trunk/internals/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/internals/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 555 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/migration-toolkit/Makefile
===================================================================
--- trunk/migration-toolkit/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/migration-toolkit/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 579 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/mysql/Makefile
===================================================================
--- trunk/mysql/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/mysql/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 543 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/mysqldoc-guide/Makefile
===================================================================
--- trunk/mysqldoc-guide/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/mysqldoc-guide/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 570 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/mysqlqb/Makefile
===================================================================
--- trunk/mysqlqb/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/mysqlqb/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 551 bytes

@@ -18,8 +18,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/mysqltest/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 555 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/ndbapi/Makefile
===================================================================
--- trunk/ndbapi/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/ndbapi/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 546 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/proto-doc/Makefile
===================================================================
--- trunk/proto-doc/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/proto-doc/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 555 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/query-browser/Makefile
===================================================================
--- trunk/query-browser/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/query-browser/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 567 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/quick-guides/Makefile
===================================================================
--- trunk/quick-guides/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/quick-guides/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 564 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/refman-4.1/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 558 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/refman-4.1/Makefile.depends	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 708 bytes

@@ -269,7 +269,8 @@
 	../refman-4.1/metadata/optimization.idmap \
 	../refman-4.1/metadata/programs-client.idmap \
 	../refman-4.1/metadata/spatial-extensions.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap
+	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
+	../refman-4.1/metadata/storage-engines.idmap
 data-types.validpure: $(data_types_SOURCES)
 data-types.titles: $(data_types_SOURCES)
 data-types.useless: $(data_types_SOURCES)


Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/refman-5.0/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 558 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/refman-5.0/Makefile.depends	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 5, Lines Added: 7, Lines Deleted: 4; 2898 bytes

@@ -269,7 +269,8 @@
 	../refman-5.0/metadata/precision-math.idmap \
 	../refman-5.0/metadata/programs-client-core.idmap \
 	../refman-5.0/metadata/spatial-extensions.idmap \
-	../refman-5.0/metadata/sql-syntax-data-definition.idmap
+	../refman-5.0/metadata/sql-syntax-data-definition.idmap \
+	../refman-5.0/metadata/storage-engines.idmap
 data-types.validpure: $(data_types_SOURCES)
 data-types.titles: $(data_types_SOURCES)
 data-types.useless: $(data_types_SOURCES)

@@ -868,10 +869,10 @@
 	../refman-5.0/metadata/programs-client-core.idmap \
 	../refman-5.0/metadata/programs-using.idmap \
 	../refman-5.0/metadata/restrictions.idmap \
-	../refman-5.0/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
 	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-5.0/metadata/sql-syntax.idmap \
+	../refman-5.0/metadata/stored-programs-views.idmap \
 	../refman-5.0/metadata/tutorial.idmap
 dynxml-local-programs-client.validpure: $(dynxml_local_programs_client_SOURCES)
 dynxml-local-programs-client.titles: $(dynxml_local_programs_client_SOURCES)

@@ -2816,10 +2817,10 @@
 	../refman-5.0/metadata/programs-using.idmap \
 	../refman-5.0/metadata/replication-implementation.idmap \
 	../refman-5.0/metadata/restrictions.idmap \
-	../refman-5.0/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
 	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-5.0/metadata/sql-syntax.idmap \
+	../refman-5.0/metadata/stored-programs-views.idmap \
 	../refman-5.0/metadata/tutorial.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)

@@ -3325,7 +3326,8 @@
 	../refman-5.0/metadata/restrictions.idmap \
 	../refman-5.0/metadata/sql-syntax-compound-statements.idmap \
 	../refman-5.0/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/sql-syntax-server-administration.idmap
+	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
+	../refman-5.0/metadata/stored-programs-views.idmap
 sql-syntax-compound-statements.validpure: $(sql_syntax_compound_statements_SOURCES)
 sql-syntax-compound-statements.titles: $(sql_syntax_compound_statements_SOURCES)
 sql-syntax-compound-statements.useless: $(sql_syntax_compound_statements_SOURCES)

@@ -3729,6 +3731,7 @@
 triggers_IDMAPS = \
 	../refman-5.0/metadata/faqs.idmap \
 	../refman-5.0/metadata/information-schema.idmap \
+	../refman-5.0/metadata/programs-installation.idmap \
 	../refman-5.0/metadata/restrictions.idmap \
 	../refman-5.0/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.0/metadata/sql-syntax-server-administration.idmap \


Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/refman-5.1/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 558 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/refman-5.1/Makefile.depends	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 8, Lines Added: 8, Lines Deleted: 7; 4263 bytes

@@ -274,7 +274,8 @@
 	../refman-5.1/metadata/precision-math.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
 	../refman-5.1/metadata/spatial-extensions.idmap \
-	../refman-5.1/metadata/sql-syntax-data-definition.idmap
+	../refman-5.1/metadata/sql-syntax-data-definition.idmap \
+	../refman-5.1/metadata/storage-engines.idmap
 data-types.validpure: $(data_types_SOURCES)
 data-types.titles: $(data_types_SOURCES)
 data-types.useless: $(data_types_SOURCES)

@@ -958,10 +959,10 @@
 	../refman-5.1/metadata/programs-client-core.idmap \
 	../refman-5.1/metadata/programs-using.idmap \
 	../refman-5.1/metadata/restrictions.idmap \
-	../refman-5.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.1/metadata/sql-syntax-data-manipulation.idmap \
 	../refman-5.1/metadata/sql-syntax-server-administration.idmap \
 	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-programs-views.idmap \
 	../refman-5.1/metadata/tutorial.idmap
 dynxml-local-programs-client.validpure: $(dynxml_local_programs_client_SOURCES)
 dynxml-local-programs-client.titles: $(dynxml_local_programs_client_SOURCES)

@@ -1109,10 +1110,10 @@
 	../refman-5.1/metadata/events.idmap \
 	../refman-5.1/metadata/information-schema.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
 	../refman-5.1/metadata/restrictions.idmap \
 	../refman-5.1/metadata/sql-syntax-compound-statements.idmap \
 	../refman-5.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/sql-syntax-prepared-statements.idmap \
 	../refman-5.1/metadata/sql-syntax-server-administration.idmap \
 	../refman-5.1/metadata/stored-programs-views.idmap \
 	../refman-5.1/metadata/triggers.idmap

@@ -2844,10 +2845,10 @@
 	../refman-5.1/metadata/programs-using.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/restrictions.idmap \
-	../refman-5.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.1/metadata/sql-syntax-data-manipulation.idmap \
 	../refman-5.1/metadata/sql-syntax-server-administration.idmap \
 	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-programs-views.idmap \
 	../refman-5.1/metadata/tutorial.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)

@@ -3038,7 +3039,6 @@
 restrictions_IMAGES =
 restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
 restrictions_IDMAPS = \
-	../refman-5.1/metadata/events.idmap \
 	../refman-5.1/metadata/internationalization.idmap \
 	../refman-5.1/metadata/restrictions.idmap \
 	../refman-5.1/metadata/sql-syntax-compound-statements.idmap \

@@ -3258,7 +3258,8 @@
 	../refman-5.1/metadata/restrictions.idmap \
 	../refman-5.1/metadata/sql-syntax-compound-statements.idmap \
 	../refman-5.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/sql-syntax-server-administration.idmap
+	../refman-5.1/metadata/sql-syntax-server-administration.idmap \
+	../refman-5.1/metadata/stored-programs-views.idmap
 sql-syntax-compound-statements.validpure: $(sql_syntax_compound_statements_SOURCES)
 sql-syntax-compound-statements.titles: $(sql_syntax_compound_statements_SOURCES)
 sql-syntax-compound-statements.useless: $(sql_syntax_compound_statements_SOURCES)

@@ -3642,7 +3643,6 @@
 	../refman-5.1/metadata/sql-syntax-compound-statements.idmap \
 	../refman-5.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.1/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-5.1/metadata/sql-syntax-prepared-statements.idmap \
 	../refman-5.1/metadata/sql-syntax-server-administration.idmap \
 	../refman-5.1/metadata/stored-programs-views.idmap \
 	../refman-5.1/metadata/triggers.idmap

@@ -3696,6 +3696,7 @@
 triggers_IDMAPS = \
 	../refman-5.1/metadata/faqs.idmap \
 	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
 	../refman-5.1/metadata/restrictions.idmap \
 	../refman-5.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.1/metadata/sql-syntax-server-administration.idmap \


Modified: trunk/refman-5.1-maria/Makefile
===================================================================
--- trunk/refman-5.1-maria/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/refman-5.1-maria/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 576 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/refman-6.0/Makefile
===================================================================
--- trunk/refman-6.0/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/refman-6.0/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 558 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/refman-6.0/Makefile.depends	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 9, Lines Added: 8, Lines Deleted: 8; 4642 bytes

@@ -275,7 +275,8 @@
 	../refman-6.0/metadata/precision-math.idmap \
 	../refman-6.0/metadata/programs-client-core.idmap \
 	../refman-6.0/metadata/spatial-extensions.idmap \
-	../refman-6.0/metadata/sql-syntax-data-definition.idmap
+	../refman-6.0/metadata/sql-syntax-data-definition.idmap \
+	../refman-6.0/metadata/storage-engines.idmap
 data-types.validpure: $(data_types_SOURCES)
 data-types.titles: $(data_types_SOURCES)
 data-types.useless: $(data_types_SOURCES)

@@ -585,7 +586,6 @@
 dynxml_local_installing_IMAGES =
 dynxml_local_installing_SOURCES = dynxml-local-installing.xml
$(dynxml_local_installing_INCLUDES)
 dynxml_local_installing_IDMAPS = \
-	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
 	../refman-6.0/metadata/apis-c.idmap \
 	../refman-6.0/metadata/backup.idmap \

@@ -778,10 +778,10 @@
 	../refman-6.0/metadata/programs-client-core.idmap \
 	../refman-6.0/metadata/programs-using.idmap \
 	../refman-6.0/metadata/restrictions.idmap \
-	../refman-6.0/metadata/sql-syntax-data-definition.idmap \
 	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
 	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/stored-programs-views.idmap \
 	../refman-6.0/metadata/tutorial.idmap
 dynxml-local-programs-client.validpure: $(dynxml_local_programs_client_SOURCES)
 dynxml-local-programs-client.titles: $(dynxml_local_programs_client_SOURCES)

@@ -1003,10 +1003,10 @@
 	../refman-6.0/metadata/events.idmap \
 	../refman-6.0/metadata/information-schema.idmap \
 	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/programs-installation.idmap \
 	../refman-6.0/metadata/restrictions.idmap \
 	../refman-6.0/metadata/sql-syntax-compound-statements.idmap \
 	../refman-6.0/metadata/sql-syntax-data-definition.idmap \
-	../refman-6.0/metadata/sql-syntax-prepared-statements.idmap \
 	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-6.0/metadata/stored-programs-views.idmap \
 	../refman-6.0/metadata/triggers.idmap

@@ -2035,10 +2035,10 @@
 	../refman-6.0/metadata/programs-using.idmap \
 	../refman-6.0/metadata/replication-implementation.idmap \
 	../refman-6.0/metadata/restrictions.idmap \
-	../refman-6.0/metadata/sql-syntax-data-definition.idmap \
 	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
 	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/stored-programs-views.idmap \
 	../refman-6.0/metadata/tutorial.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)

@@ -2229,7 +2229,6 @@
 restrictions_IMAGES =
 restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
 restrictions_IDMAPS = \
-	../refman-6.0/metadata/events.idmap \
 	../refman-6.0/metadata/internationalization.idmap \
 	../refman-6.0/metadata/restrictions.idmap \
 	../refman-6.0/metadata/sql-syntax-compound-statements.idmap \

@@ -2475,7 +2474,8 @@
 	../refman-6.0/metadata/restrictions.idmap \
 	../refman-6.0/metadata/sql-syntax-compound-statements.idmap \
 	../refman-6.0/metadata/sql-syntax-data-definition.idmap \
-	../refman-6.0/metadata/sql-syntax-server-administration.idmap
+	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
+	../refman-6.0/metadata/stored-programs-views.idmap
 sql-syntax-compound-statements.validpure: $(sql_syntax_compound_statements_SOURCES)
 sql-syntax-compound-statements.titles: $(sql_syntax_compound_statements_SOURCES)
 sql-syntax-compound-statements.useless: $(sql_syntax_compound_statements_SOURCES)

@@ -2858,7 +2858,6 @@
 	../refman-6.0/metadata/sql-syntax-compound-statements.idmap \
 	../refman-6.0/metadata/sql-syntax-data-definition.idmap \
 	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-6.0/metadata/sql-syntax-prepared-statements.idmap \
 	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-6.0/metadata/stored-programs-views.idmap \
 	../refman-6.0/metadata/triggers.idmap

@@ -2912,6 +2911,7 @@
 triggers_IDMAPS = \
 	../refman-6.0/metadata/faqs.idmap \
 	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/programs-installation.idmap \
 	../refman-6.0/metadata/restrictions.idmap \
 	../refman-6.0/metadata/sql-syntax-data-definition.idmap \
 	../refman-6.0/metadata/sql-syntax-server-administration.idmap \


Modified: trunk/refman-common/Makefile
===================================================================
--- trunk/refman-common/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/refman-common/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 567 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/sample-data/Makefile
===================================================================
--- trunk/sample-data/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/sample-data/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 508 bytes

@@ -5,8 +5,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 SUBDIRS = \
 	sakila \


Modified: trunk/sample-data/employee/Makefile
===================================================================
--- trunk/sample-data/employee/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/sample-data/employee/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 591 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/sample-data/sakila/Makefile
===================================================================
--- trunk/sample-data/sakila/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/sample-data/sakila/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 585 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/sample-data/world/Makefile
===================================================================
--- trunk/sample-data/world/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/sample-data/world/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 582 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/topic-guides/Makefile
===================================================================
--- trunk/topic-guides/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/topic-guides/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 515 bytes

@@ -5,8 +5,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 SUBDIRS = \
 	topics-5.0 \


Modified: trunk/topic-guides/topics-5.0/Makefile
===================================================================
--- trunk/topic-guides/topics-5.0/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/topic-guides/topics-5.0/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 600 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/topic-guides/topics-5.1/Makefile
===================================================================
--- trunk/topic-guides/topics-5.1/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/topic-guides/topics-5.1/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 600 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/topic-guides/topics-6.0/Makefile
===================================================================
--- trunk/topic-guides/topics-6.0/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/topic-guides/topics-6.0/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 600 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/topic-guides/topics-common/Makefile
===================================================================
--- trunk/topic-guides/topics-common/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/topic-guides/topics-common/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 609 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ../..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/userguide/Makefile
===================================================================
--- trunk/userguide/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/userguide/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 555 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
 


Modified: trunk/workbench/Makefile
===================================================================
--- trunk/workbench/Makefile	2008-09-27 06:06:10 UTC (rev 11892)
+++ trunk/workbench/Makefile	2008-09-27 06:07:31 UTC (rev 11893)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 555 bytes

@@ -3,8 +3,8 @@
 # Location of repository root relative to current directory
 REPO_ROOT = ..
 
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
+# Include the main repo configuration
+include $(REPO_ROOT)/Makefile.repo
 
 # Set any variables here that should override imported standard variables
Thread
• svn commit - mysqldoc@docsrva: r11893 - in trunk: . administrator dynamic-docs/build-configure dynamic-docs/changelog dynamic-docs/command-optvars dyn...	martin.brown	27 Sep