Author: jstephens
Date: 2007-01-13 09:11:41 +0100 (Sat, 13 Jan 2007)
New Revision: 4500
Log:
Synching changes to refman-telco branch.
Added:
branches/telcos/refman-common/images/cmxj-overview.png
branches/telcos/refman-common/images/cnet-win-install-step1.png
branches/telcos/refman-common/images/cnet-win-install-step2.png
branches/telcos/refman-common/images/cnet-win-install-step3.png
branches/telcos/refman-common/images/cnet-win-install-step4.png
branches/telcos/refman-common/images/cnet-win-install-step5.png
branches/telcos/refman-common/images/cnet-win-install-step6.png
branches/telcos/refman-common/images/myaccess-odbc.png
branches/telcos/refman-common/images/myaccess.png
branches/telcos/refman-common/images/myarchitecture.graffle
branches/telcos/refman-common/images/myarchitecture.png
branches/telcos/refman-common/images/myflowchart.png
branches/telcos/refman-common/images/myodbc-crystal-1.png
branches/telcos/refman-common/images/myodbc-crystal-2.png
branches/telcos/refman-common/images/myodbc-crystal-3.png
branches/telcos/refman-common/images/myodbc-crystal-4.png
branches/telcos/refman-common/images/myodbc-crystal-5.png
branches/telcos/refman-common/images/myodbc-crystal-6.png
branches/telcos/refman-common/images/myodbc-excel-step1.png
branches/telcos/refman-common/images/myodbc-excel-step2.png
branches/telcos/refman-common/images/myodbc-excel-step3.png
branches/telcos/refman-common/images/myodbc-excel-step4.png
branches/telcos/refman-common/images/myodbc-excel-step5.png
branches/telcos/refman-common/images/myodbc-macosx-install-step1.png
branches/telcos/refman-common/images/myodbc-macosx-install-step2.png
branches/telcos/refman-common/images/myodbc-macosx-install-step3.png
branches/telcos/refman-common/images/myodbc-macosx-install-step4.png
branches/telcos/refman-common/images/myodbc-macosx-install-step5.png
branches/telcos/refman-common/images/myodbc-macosx-install-step6.png
branches/telcos/refman-common/images/myodbc-macosx-odbcadmin-adddsn.png
branches/telcos/refman-common/images/myodbc-macosx-odbcadmin-main.png
branches/telcos/refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png
branches/telcos/refman-common/images/myodbc-macosx-odbcadmin-tracing.png
branches/telcos/refman-common/images/myodbc-win-install-step1.png
branches/telcos/refman-common/images/myodbc-win-install-step2.png
branches/telcos/refman-common/images/myodbc-win-install-step3.png
branches/telcos/refman-common/images/myodbc-win-install-step4.png
branches/telcos/refman-common/images/myodbc-win-odbcadmin-adddsn.png
branches/telcos/refman-common/images/myodbc-win-odbcadmin-advanced.png
branches/telcos/refman-common/images/myodbc-win-odbcadmin-driverselect.png
branches/telcos/refman-common/images/myodbc-win-odbcadmin-main.png
branches/telcos/refman-common/images/myodbc-win-odbcadmin-options.png
branches/telcos/refman-common/images/myodbc-win-odbcadmin-sampledsn.png
branches/telcos/refman-common/images/myodbc-win-tracing.png
branches/telcos/refman-common/images/mysql-vstudioplugin-1.png
branches/telcos/refman-common/images/mysql-vstudioplugin-2.png
branches/telcos/refman-common/images/mysql-vstudioplugin-3.png
branches/telcos/refman-common/images/mysql-vstudioplugin-4.png
Removed:
branches/telcos/refman-4.1/connector-j.xml
branches/telcos/refman-4.1/connector-mxj.xml
branches/telcos/refman-4.1/connector-net.xml
branches/telcos/refman-4.1/connector-odbc.xml
branches/telcos/refman-4.1/connector-php.xml
branches/telcos/refman-5.0/connector-j.xml
branches/telcos/refman-5.0/connector-mxj.xml
branches/telcos/refman-5.0/connector-net.xml
branches/telcos/refman-5.0/connector-odbc.xml
branches/telcos/refman-5.0/connector-php.xml
branches/telcos/refman-5.0/images/cnet-win-install-step1.png
branches/telcos/refman-5.0/images/cnet-win-install-step2.png
branches/telcos/refman-5.0/images/cnet-win-install-step3.png
branches/telcos/refman-5.0/images/cnet-win-install-step4.png
branches/telcos/refman-5.0/images/cnet-win-install-step6.png
branches/telcos/refman-5.0/images/myaccess-odbc.png
branches/telcos/refman-5.0/images/myaccess.png
branches/telcos/refman-5.0/images/myarchitecture.graffle
branches/telcos/refman-5.0/images/myarchitecture.png
branches/telcos/refman-5.0/images/myflowchart.graffle
branches/telcos/refman-5.0/images/myflowchart.png
branches/telcos/refman-5.0/images/myodbc-crystal-1.png
branches/telcos/refman-5.0/images/myodbc-crystal-2.png
branches/telcos/refman-5.0/images/myodbc-crystal-3.png
branches/telcos/refman-5.0/images/myodbc-crystal-4.png
branches/telcos/refman-5.0/images/myodbc-crystal-5.png
branches/telcos/refman-5.0/images/myodbc-crystal-6.png
branches/telcos/refman-5.0/images/myodbc-excel-step1.png
branches/telcos/refman-5.0/images/myodbc-excel-step2.png
branches/telcos/refman-5.0/images/myodbc-excel-step3.png
branches/telcos/refman-5.0/images/myodbc-excel-step4.png
branches/telcos/refman-5.0/images/myodbc-excel-step5.png
branches/telcos/refman-5.0/images/myodbc-macosx-install-step1.png
branches/telcos/refman-5.0/images/myodbc-macosx-install-step2.png
branches/telcos/refman-5.0/images/myodbc-macosx-install-step3.png
branches/telcos/refman-5.0/images/myodbc-macosx-install-step4.png
branches/telcos/refman-5.0/images/myodbc-macosx-install-step5.png
branches/telcos/refman-5.0/images/myodbc-macosx-install-step6.png
branches/telcos/refman-5.0/images/myodbc-macosx-odbcadmin-adddsn.png
branches/telcos/refman-5.0/images/myodbc-macosx-odbcadmin-main.png
branches/telcos/refman-5.0/images/myodbc-macosx-odbcadmin-sampledsn.png
branches/telcos/refman-5.0/images/myodbc-macosx-odbcadmin-tracing.png
branches/telcos/refman-5.0/images/myodbc-win-install-step1.png
branches/telcos/refman-5.0/images/myodbc-win-install-step2.png
branches/telcos/refman-5.0/images/myodbc-win-install-step3.png
branches/telcos/refman-5.0/images/myodbc-win-install-step4.png
branches/telcos/refman-5.0/images/myodbc-win-odbcadmin-adddsn.png
branches/telcos/refman-5.0/images/myodbc-win-odbcadmin-advanced.png
branches/telcos/refman-5.0/images/myodbc-win-odbcadmin-driverselect.png
branches/telcos/refman-5.0/images/myodbc-win-odbcadmin-main.png
branches/telcos/refman-5.0/images/myodbc-win-odbcadmin-options.png
branches/telcos/refman-5.0/images/myodbc-win-odbcadmin-sampledsn.png
branches/telcos/refman-5.0/images/myodbc-win-tracing.png
branches/telcos/refman-5.1/connector-j.xml
branches/telcos/refman-5.1/connector-mxj.xml
branches/telcos/refman-5.1/connector-net.xml
branches/telcos/refman-5.1/connector-odbc.xml
branches/telcos/refman-5.1/connector-php.xml
branches/telcos/refman-5.1/connector-vstudioplugin.xml
branches/telcos/refman-5.1/images/cnet-win-install-step1.png
branches/telcos/refman-5.1/images/cnet-win-install-step2.png
branches/telcos/refman-5.1/images/cnet-win-install-step3.png
branches/telcos/refman-5.1/images/cnet-win-install-step4.png
branches/telcos/refman-5.1/images/cnet-win-install-step5.png
branches/telcos/refman-5.1/images/cnet-win-install-step6.png
branches/telcos/refman-5.1/images/myaccess-odbc.png
branches/telcos/refman-5.1/images/myaccess.png
branches/telcos/refman-5.1/images/myarchitecture.graffle
branches/telcos/refman-5.1/images/myarchitecture.png
branches/telcos/refman-5.1/images/myflowchart.graffle
branches/telcos/refman-5.1/images/myflowchart.png
branches/telcos/refman-5.1/images/myodbc-crystal-1.png
branches/telcos/refman-5.1/images/myodbc-crystal-2.png
branches/telcos/refman-5.1/images/myodbc-crystal-3.png
branches/telcos/refman-5.1/images/myodbc-crystal-4.png
branches/telcos/refman-5.1/images/myodbc-crystal-5.png
branches/telcos/refman-5.1/images/myodbc-crystal-6.png
branches/telcos/refman-5.1/images/myodbc-excel-step1.png
branches/telcos/refman-5.1/images/myodbc-excel-step2.png
branches/telcos/refman-5.1/images/myodbc-excel-step3.png
branches/telcos/refman-5.1/images/myodbc-excel-step4.png
branches/telcos/refman-5.1/images/myodbc-excel-step5.png
branches/telcos/refman-5.1/images/myodbc-macosx-install-step1.png
branches/telcos/refman-5.1/images/myodbc-macosx-install-step2.png
branches/telcos/refman-5.1/images/myodbc-macosx-install-step3.png
branches/telcos/refman-5.1/images/myodbc-macosx-install-step4.png
branches/telcos/refman-5.1/images/myodbc-macosx-install-step5.png
branches/telcos/refman-5.1/images/myodbc-macosx-install-step6.png
branches/telcos/refman-5.1/images/myodbc-macosx-odbcadmin-adddsn.png
branches/telcos/refman-5.1/images/myodbc-macosx-odbcadmin-main.png
branches/telcos/refman-5.1/images/myodbc-macosx-odbcadmin-sampledsn.png
branches/telcos/refman-5.1/images/myodbc-macosx-odbcadmin-tracing.png
branches/telcos/refman-5.1/images/myodbc-win-install-step1.png
branches/telcos/refman-5.1/images/myodbc-win-install-step2.png
branches/telcos/refman-5.1/images/myodbc-win-install-step3.png
branches/telcos/refman-5.1/images/myodbc-win-install-step4.png
branches/telcos/refman-5.1/images/myodbc-win-odbcadmin-adddsn.png
branches/telcos/refman-5.1/images/myodbc-win-odbcadmin-advanced.png
branches/telcos/refman-5.1/images/myodbc-win-odbcadmin-driverselect.png
branches/telcos/refman-5.1/images/myodbc-win-odbcadmin-main.png
branches/telcos/refman-5.1/images/myodbc-win-odbcadmin-options.png
branches/telcos/refman-5.1/images/myodbc-win-odbcadmin-sampledsn.png
branches/telcos/refman-5.1/images/myodbc-win-tracing.png
branches/telcos/refman-5.1/images/mysql-vstudioplugin-1.png
branches/telcos/refman-5.1/images/mysql-vstudioplugin-2.png
branches/telcos/refman-5.1/images/mysql-vstudioplugin-3.png
branches/telcos/refman-5.1/images/mysql-vstudioplugin-4.png
Modified:
branches/telcos/Makefile
branches/telcos/make.d/fragment-files
branches/telcos/make.d/vars-docbook
branches/telcos/make.d/xml-chm
branches/telcos/make.d/xml-html-chapter
branches/telcos/make.d/xml-xhtml-chapter
branches/telcos/refman-4.1/Makefile
branches/telcos/refman-4.1/connectors.xml
branches/telcos/refman-5.0/Makefile
branches/telcos/refman-5.0/connectors.xml
branches/telcos/refman-5.1/Makefile
branches/telcos/refman-5.1/client-utility-programs.xml
branches/telcos/refman-5.1/connectors.xml
branches/telcos/refman-5.1/database-administration.xml
branches/telcos/refman-5.1/events.xml
branches/telcos/refman-5.1/functions.xml
branches/telcos/refman-5.1/installing.xml
branches/telcos/refman-5.1/language-structure.xml
branches/telcos/refman-5.1/news-5.1.xml
branches/telcos/refman-5.1/optimization.xml
branches/telcos/refman-5.1/renamed-nodes.txt
branches/telcos/refman-5.1/replication.xml
branches/telcos/refman-5.1/se-federated.xml
branches/telcos/refman-5.1/se-innodb.xml
branches/telcos/refman-5.1/sql-syntax.xml
branches/telcos/refman-5.1/storage-engines.xml
branches/telcos/refman-5.1/stored-procedures.xml
branches/telcos/refman-5.1/triggers.xml
branches/telcos/refman-5.1/views.xml
branches/telcos/refman-common/Makefile
branches/telcos/tools/make-reserved-words-new.rb
branches/telcos/tools/update-reserved-words.pl
branches/telcos/tools/xmlformat.conf
branches/telcos/xsl.d/dbk-texi.xsl
branches/telcos/xsl.d/help-prep2.xsl
branches/telcos/xsl.d/mysql-fo.xsl
branches/telcos/xsl.d/mysql-html-section.xsl
branches/telcos/xsl.d/mysql-html.css
branches/telcos/xsl.d/mysql-html.xsl
trunk/refman-4.1/connectors.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/news-5.1.xml
trunk/refman-5.1/se-federated.xml
trunk/refman-5.1/storage-engines.xml
Property changes on: branches/telcos/refman-common/images/cmxj-overview.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/cnet-win-install-step1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/cnet-win-install-step2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/cnet-win-install-step3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/cnet-win-install-step4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/cnet-win-install-step5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/cnet-win-install-step6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myaccess-odbc.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myaccess.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myarchitecture.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myflowchart.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-crystal-1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-crystal-2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-crystal-3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-crystal-4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-crystal-5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-crystal-6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-excel-step1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-excel-step2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-excel-step3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-excel-step4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-excel-step5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-macosx-install-step1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-macosx-install-step2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-macosx-install-step3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-macosx-install-step4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-macosx-install-step5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-macosx-install-step6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-macosx-odbcadmin-adddsn.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-macosx-odbcadmin-main.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-macosx-odbcadmin-tracing.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-win-install-step1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-win-install-step2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-win-install-step3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-win-install-step4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-win-odbcadmin-adddsn.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-win-odbcadmin-advanced.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-win-odbcadmin-driverselect.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-win-odbcadmin-main.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-win-odbcadmin-options.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-win-odbcadmin-sampledsn.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/myodbc-win-tracing.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/mysql-vstudioplugin-1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/mysql-vstudioplugin-2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/mysql-vstudioplugin-3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/telcos/refman-common/images/mysql-vstudioplugin-4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/telcos/Makefile
===================================================================
--- branches/telcos/Makefile 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/Makefile 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 607 bytes
@@ -4,9 +4,9 @@
# Set list of subdirectories
-SUBDIRS = administrator gui-common guibook guihelp \
+SUBDIRS = administrator gui-common guibook \
internals migration-toolkit \
- mysqltest ndbapi proto-doc query-browser \
+ mysqlqb mysqltest ndbapi proto-doc query-browser \
refman-4.1 refman-5.0 refman-5.1 refman-common \
userguide workbench sample-data/world sample-data/sakila
Modified: branches/telcos/make.d/fragment-files
===================================================================
--- branches/telcos/make.d/fragment-files 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/make.d/fragment-files 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 850 bytes
@@ -76,12 +76,18 @@
$(CHAPTERFMT) mac-os-x-installation.html
mv mac-os-x-installation.html ReadMe.html
-RELEASE-NOTES:: manual.txt $(GENERATE_TEXT_FILES)
+RELEASE-NOTES-ENTERPRISE:: manual.txt $(GENERATE_TEXT_FILES)
perl -w $(GENERATE_TEXT_FILES) manual.txt \
"MySQL Enterprise Release Notes" \
"MySQL Change History" \
> $@
+RELEASE-NOTES-COMMUNITY:: manual.txt $(GENERATE_TEXT_FILES)
+ perl -w $(GENERATE_TEXT_FILES) manual.txt \
+ "MySQL Community Server Release Notes" \
+ "MySQL Change History" \
+ > $@
+
clean::
$(RM) $(TEXT_FRAGMENT_FILES)
$(RM) $(HTML_FRAGMENT_FILES)
Modified: branches/telcos/make.d/vars-docbook
===================================================================
--- branches/telcos/make.d/vars-docbook 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/make.d/vars-docbook 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 1; 873 bytes
@@ -259,8 +259,16 @@
$(XSL_DIR)/mysql-disclaimer-xhtml.xsl \
$(HTML_CSS_FILE)
-# Driver stylesheet for Docbook -> HTML, one file per chapter or section
+# Driver stylesheet for Docbook -> XHTML GUI help,
+# one file per chapter or section
+MYSQL_GUIHELP_XSL = $(XSL_DIR)/mysql-guihelp.xsl
+MYSQL_GUIHELP_XSL_DEPS = $(MYSQL_GUIHELP_XSL) \
+ $(XSL_DIR)/mysql-disclaimer-xhtml.xsl \
+ $(HTML_CSS_FILE)
+
+# Driver stylesheet for Docbook -> Eclipse HTML, one file per chapter or section
+
MYSQL_ECLIPSE_XSL = $(XSL_DIR)/mysql-eclipse.xsl
MYSQL_ECLIPSE_XSL_DEPS = $(MYSQL_ECLIPSE_XSL) \
$(XSL_DIR)/mysql-disclaimer-html.xsl
Modified: branches/telcos/make.d/xml-chm
===================================================================
--- branches/telcos/make.d/xml-chm 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/make.d/xml-chm 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 508 bytes
@@ -4,7 +4,7 @@
# (Language sensitive)
# Use html-section driver file, but set chunk.section.depth to 0,
-# causes chunking at the chapter level.
+# which causes chunking at the chapter level.
# The %_SRCS variable must be set to the list of target dependencies.
Modified: branches/telcos/make.d/xml-html-chapter
===================================================================
--- branches/telcos/make.d/xml-html-chapter 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/make.d/xml-html-chapter 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 535 bytes
@@ -2,7 +2,7 @@
# (Language sensitive)
# Use html-section driver file, but set chunk.section.depth to 0,
-# causes chunking at the chapter level.
+# which causes chunking at the chapter level.
# The %_SRCS variable must be set to the list of target dependencies.
Modified: branches/telcos/make.d/xml-xhtml-chapter
===================================================================
--- branches/telcos/make.d/xml-xhtml-chapter 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/make.d/xml-xhtml-chapter 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 539 bytes
@@ -2,7 +2,7 @@
# (Language sensitive)
# Use xhtml-section driver file, but set chunk.section.depth to 0,
-# causes chunking at the chapter level.
+# which causes chunking at the chapter level.
# The %_SRCS variable must be set to the list of target dependencies.
Modified: branches/telcos/refman-4.1/Makefile
===================================================================
--- branches/telcos/refman-4.1/Makefile 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-4.1/Makefile 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 37; 10036 bytes
@@ -42,47 +42,11 @@
MANUAL_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent ../common/phrases.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml database-administration.xml data-types.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml extending-mysql.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/cmxj-overview.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-crystal-1.png images/myodbc-crystal-2.png images/myodbc-crystal-3.png images/myodbc-crystal-4.png images/myodbc-crystal-5.png images/myodbc-crystal-6.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png im!
ages/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/ndb-size-pl-1.png images/replicas-groups-1-1.png images/replicas-groups!
-1-2.png images/rolling-restarts.png installing.xml introducti!
on.xml l
anguage-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news-3.23.xml news-4.0.xml news-4.1.xml news.xml optimization.xml porting.xml preface.xml problems.xml ../refman-common/bug-reports.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-innodb.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/what-is.en.xml ../refman-common/what-is-mysql-ab.en.xml replication.xml reserved-new-4.0.xml reserved-new-4.1.xml reservedwords.xml restrictions.xml se-innodb.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml tutorial.xml using-mysql-programs.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml ../refman-common/bug-reports.xml ../refman-common/connector-j.xml ../refman-common/connector-mxj.xml ../refman-common/connector-net.xml ../refman-common/connector-odbc.xml ../refman-common/connector-php.xml ../refman-common/connector-vstudioplugin.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/images/cmxj-overview.png ../refman-common/images/cnet-win-install-step1.png ../refman-common/images/cnet-win-install-step2.png ../refman-common/images/cnet-win-install-step3.png ../refman-common/images/cnet-win-install-step4.png ../refman-common/images/cnet-win-install-step6.png ../refman-common/images/myaccess-odbc.png ../refman-common/images/myaccess.png ../refman-common/images/myarchitecture.png ../refman-common/images/myflowchart.png ../refman-common/images/myodbc-crystal-1.png ../refman-common/images/myodbc-crystal-2.png ../refman-common/images/myodbc-cryst!
al-3.png ../refman-common/images/myodbc-crystal-4.png ../refman-common/images/myodbc-crystal-5.png ../refman-common/images/myodbc-crystal-6.png ../refman-common/images/myodbc-excel-step1.png ../refman-common/images/myodbc-excel-step2.png ../refman-common/images/myodbc-excel-step3.png ../refman-common/images/myodbc-excel-step4.png ../refman-common/images/myodbc-excel-step5.png ../refman-common/images/myodbc-macosx-install-step1.png ../refman-common/images/myodbc-macosx-install-step2.png ../refman-common/images/myodbc-macosx-install-step3.png ../refman-common/images/myodbc-macosx-install-step4.png ../refman-common/images/myodbc-macosx-install-step5.png ../refman-common/images/myodbc-macosx-install-step6.png ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png ../refman-common/images/myodbc-macosx-odbcadmin-main.png ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png ../refman-common/images/myodbc-win-!
install-step1.png ../refman-common/images/myodbc-win-install-s!
tep2.png
../refman-common/images/myodbc-win-install-step3.png ../refman-common/images/myodbc-win-install-step4.png ../refman-common/images/myodbc-win-odbcadmin-adddsn.png ../refman-common/images/myodbc-win-odbcadmin-advanced.png ../refman-common/images/myodbc-win-odbcadmin-driverselect.png ../refman-common/images/myodbc-win-odbcadmin-main.png ../refman-common/images/myodbc-win-odbcadmin-options.png ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png ../refman-common/images/myodbc-win-tracing.png ../refman-common/images/mysql-vstudioplugin-1.png ../refman-common/images/mysql-vstudioplugin-3.png ../refman-common/images/mysql-vstudioplugin-4.png ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-innodb.xml ../refman-common/news-myodbc.!
xml ../refman-common/regexp.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml apis.xml charset.xml client-utility-programs.xml connectors.xml copyright.xml data-types.xml database-administration.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml extending-mysql.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/multi-comp-1.png images/ndb-size-pl-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/rolling-restarts.png installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news-3.23.xml news-4.0.xml news-4.1.xml news.xml optimization.xml porting.xml preface.xml problems.xml replication.xml reserved-new-4.0.xml reserved-new-4.1.xml reservedwords.xml restrictions.xml se-innodb.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml tutorial.xml using-mysql-programs.xml
manual-prepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS)
manual-manprepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS)
-# We also build the connector sections as separate docs, so list dependencies
-# for them as well.
-
-depend:: connector-j.depend
-
-CONNECTOR_J_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent
-
-CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml
-
-connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
-
-depend:: connector-mxj.depend
-
-CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent
-
-CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml images/cmxj-overview.png
-
-connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
-
-depend:: connector-net.depend
-
-CONNECTOR_NET_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent
-
-CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png
-
-connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
-
-depend:: connector-odbc.depend
-
-CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent
-
-CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-crystal-1.png images/myodbc-crystal-2.png images/myodbc-crystal-3.png images/myodbc-crystal-4.png images/myodbc-crystal-5.png images/myodbc-crystal-6.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step!
3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png
-
-connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
-
-
mysql.info: manual.info
cp manual.info mysql.info
Modified: branches/telcos/refman-4.1/connectors.xml
===================================================================
--- branches/telcos/refman-4.1/connectors.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-4.1/connectors.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 3, Lines Added: 21, Lines Deleted: 5; 2157 bytes
@@ -31,6 +31,10 @@
</indexterm>
<indexterm>
+ <primary>Visual Studio Plugin</primary>
+ </indexterm>
+
+ <indexterm>
<primary>Connector/MXJ</primary>
</indexterm>
@@ -64,6 +68,16 @@
<listitem>
<para>
+ The MySQL Visual Studio Plugin works with Connector/NET and
+ Visual Studio 2005. The plugin is a MySQL DDEX Provider, which
+ means that you can use the schema and data manipulation tools
+ within Visual Studio to create and edit objects within a MySQL
+ database.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Connector/J provides driver support for connecting to MySQL from
a Java application using the standard Java Database Connectivity
(JDBC) API.
@@ -95,14 +109,16 @@
the <xref linkend="apis"/> chapter.
</para>
- <xi:include href="connector-odbc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-odbc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-net.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-net.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-j.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-vstudioplugin.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-j.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-php.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-php.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
</chapter>
Modified: branches/telcos/refman-5.0/Makefile
===================================================================
--- branches/telcos/refman-5.0/Makefile 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.0/Makefile 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 39; 12993 bytes
@@ -13,7 +13,7 @@
DOC_URL_BASE = http://dev.mysql.com/doc/refman/5.0/$(DOC_LANG)/
-TEXT_FRAGMENT_FILES_EXTRA = RELEASE-NOTES
+TEXT_FRAGMENT_FILES_EXTRA = RELEASE-NOTES-ENTERPRISE RELEASE-NOTES-COMMUNITY
# Set IDMAP and remap variables
@@ -44,7 +44,7 @@
MANUAL_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent ../common/phrases.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml ../refman-common/bug-reports.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml apis.xml charset.xml client-utility-programs.xml config-wizard.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml data-types.xml database-administration.xml dba-optvars-table.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml extending-mysql.xml faqs.xml functions.xml images/blackhole-1.png images/cluster-compo!
nents-1.png images/cluster-upgrade-downgrade-table.png images/cmxj-overview.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-crystal-1.png images/myodbc-crystal-2.png images/myodbc-crystal-3.png images/myodbc-crystal-4.png images/myodbc-crystal-5.png images/myodbc-crystal-6.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbca!
dmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png ima!
ges/myod
bc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/mysql-cfg-fig1.png images/mysql-cfg-fig10.png images/mysql-cfg-fig2.png images/mysql-cfg-fig3.png images/mysql-cfg-fig4.png images/mysql-cfg-fig5.png images/mysql-cfg-fig6.png images/mysql-cfg-fig7.png images/mysql-cfg-fig8.png images/mysql-cfg-fig9.png images/mysql-esi-linux-fig1.png images/mysql-esi-merlin-1.png images/mysql-esi-merlin-10.png images/mysql-esi-merlin-11.png images/mysql-esi-merlin-12.png images/mysql-esi-merlin-13.png images/mysql-esi-merlin-2.png images/mysql-esi-merlin-3.png images/mysql-esi-merlin-4.png im!
ages/mysql-esi-merlin-5.png images/mysql-esi-merlin-6.png images/mysql-esi-merlin-7.png images/mysql-esi-merlin-8.png images/mysql-esi-merlin-9.png images/mysql-esi-win32-fig1.png images/mysql-esi-win32-fig2.png images/mysql-esi-win32-fig3.png images/mysql-esi-win32-fig4.png images/mysql-esi-win32-fig6.png images/mysql-esi-win32-fig7.png images/mysql-esi-win32-uninst.png images/ndb-size-pl-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/rolling-restarts.png information-schema.xml installing-cs.xml installing-es.xml installing-version.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news-5.0.xml news.xml optimization.xml porting.xml precision-math.xml preface.xml problems.xml releasenotes-cs-5.0.xml releasenotes-cs.xml releasenotes-es-5.0.xml releasenotes-es.xml replication.xml reserved-new-5.0.xml reservedwords.xml restrictions.xml se-archive.xml se-bdb.xml se-blackhole.xml se-csv.xml se-ex!
ample.xml se-federated.xml se-innodb.xml se-memory.xml se-merg!
e.xml se
-myisam.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml ../refman-common/bug-reports.xml ../refman-common/connector-j.xml ../refman-common/connector-mxj.xml ../refman-common/connector-net.xml ../refman-common/connector-odbc.xml ../refman-common/connector-php.xml ../refman-common/connector-vstudioplugin.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/images/cmxj-overview.png ../refman-common/images/cnet-win-install-step1.png ../refman-common/images/cnet-win-install-step2.png ../refman-common/images/cnet-win-install-step3.png ../refman-common/images/cnet-win-install-step4.png ../refman-common/images/cnet-win-install-step6.png ../refman-common/images/myaccess-odbc.png ../refman-common/images/myaccess.png ../refman-common/images/myarchitecture.png ../refman-common/images/myflowchart.png ../refman-common/images/myodbc-crystal-1.png ../refman-common/images/myodbc-crystal-2.png ../refman-common/images/myodbc-cryst!
al-3.png ../refman-common/images/myodbc-crystal-4.png ../refman-common/images/myodbc-crystal-5.png ../refman-common/images/myodbc-crystal-6.png ../refman-common/images/myodbc-excel-step1.png ../refman-common/images/myodbc-excel-step2.png ../refman-common/images/myodbc-excel-step3.png ../refman-common/images/myodbc-excel-step4.png ../refman-common/images/myodbc-excel-step5.png ../refman-common/images/myodbc-macosx-install-step1.png ../refman-common/images/myodbc-macosx-install-step2.png ../refman-common/images/myodbc-macosx-install-step3.png ../refman-common/images/myodbc-macosx-install-step4.png ../refman-common/images/myodbc-macosx-install-step5.png ../refman-common/images/myodbc-macosx-install-step6.png ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png ../refman-common/images/myodbc-macosx-odbcadmin-main.png ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png ../refman-common/images/myodbc-win-!
install-step1.png ../refman-common/images/myodbc-win-install-s!
tep2.png
../refman-common/images/myodbc-win-install-step3.png ../refman-common/images/myodbc-win-install-step4.png ../refman-common/images/myodbc-win-odbcadmin-adddsn.png ../refman-common/images/myodbc-win-odbcadmin-advanced.png ../refman-common/images/myodbc-win-odbcadmin-driverselect.png ../refman-common/images/myodbc-win-odbcadmin-main.png ../refman-common/images/myodbc-win-odbcadmin-options.png ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png ../refman-common/images/myodbc-win-tracing.png ../refman-common/images/mysql-vstudioplugin-1.png ../refman-common/images/mysql-vstudioplugin-3.png ../refman-common/images/mysql-vstudioplugin-4.png ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-common/news-vstudio!
plugin.xml ../refman-common/regexp.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml apis.xml charset.xml client-utility-programs.xml config-wizard.xml connectors.xml copyright.xml data-types.xml database-administration.xml dba-optvars-table.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml extending-mysql.xml faqs.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/multi-comp-1.png images/mysql-cfg-fig1.png images/mysql-cfg-fig10.png images/mysql-cfg-fig2.png images/mysql-cfg-fig3.png images/mysql-cfg-fig4.png images/mysql-cfg-fig5.png images/mysql-cfg-fig6.png images/mysql-cfg-fig7.png images/mysql-cfg-fig8.png images/mysql-cfg-fig9.png images/mysql-esi-linux-fig1.png images/mysql-esi-merlin-1.png images/mysql-esi-merlin-10.png images/mysql-esi-merlin-11.png images/mysql-esi-merlin-12.png images/mysql-esi-merlin-13.png images/mysql-esi-merlin-2.png images/mysql-esi!
-merlin-3.png images/mysql-esi-merlin-4.png images/mysql-esi-m!
erlin-5.
png images/mysql-esi-merlin-6.png images/mysql-esi-merlin-7.png images/mysql-esi-merlin-8.png images/mysql-esi-merlin-9.png images/mysql-esi-win32-fig1.png images/mysql-esi-win32-fig2.png images/mysql-esi-win32-fig3.png images/mysql-esi-win32-fig4.png images/mysql-esi-win32-fig6.png images/mysql-esi-win32-fig7.png images/mysql-esi-win32-uninst.png images/ndb-size-pl-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/rolling-restarts.png information-schema.xml installing-cs.xml installing-es.xml installing-version.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news-5.0.xml news.xml optimization.xml porting.xml precision-math.xml preface.xml problems.xml releasenotes-cs-5.0.xml releasenotes-cs.xml releasenotes-es-5.0.xml releasenotes-es.xml replication.xml reserved-new-5.0.xml reservedwords.xml restrictions.xml se-archive.xml se-bdb.xml se-blackhole.xml se-csv.xml se-example.xml se-federated.xm!
l se-innodb.xml se-memory.xml se-merge.xml se-myisam.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml
manual-prepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS)
manual-manprepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS)
@@ -53,44 +53,8 @@
# when validating manual.xml or requiring the DBA chapter
database-administration.xml: dba-optvars-table.xml
-manual.xml: dba-optvars-table.xml
+manual.depend: dba-optvars-table.xml
-# We also build the connector sections as separate docs, so list dependencies
-# for them as well.
-
-depend:: connector-j.depend
-
-CONNECTOR_J_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent
-
-CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml
-
-connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
-
-depend:: connector-mxj.depend
-
-CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent
-
-CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml images/cmxj-overview.png
-
-connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
-
-depend:: connector-net.depend
-
-CONNECTOR_NET_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent
-
-CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png
-
-connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
-
-depend:: connector-odbc.depend
-
-CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent
-
-CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-crystal-1.png images/myodbc-crystal-2.png images/myodbc-crystal-3.png images/myodbc-crystal-4.png images/myodbc-crystal-5.png images/myodbc-crystal-6.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step!
3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png
-
-connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
-
-
mysql.info: manual.info
cp manual.info mysql.info
Modified: branches/telcos/refman-5.0/connectors.xml
===================================================================
--- branches/telcos/refman-5.0/connectors.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.0/connectors.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 3, Lines Added: 21, Lines Deleted: 5; 2157 bytes
@@ -31,6 +31,10 @@
</indexterm>
<indexterm>
+ <primary>Visual Studio Plugin</primary>
+ </indexterm>
+
+ <indexterm>
<primary>Connector/MXJ</primary>
</indexterm>
@@ -64,6 +68,16 @@
<listitem>
<para>
+ The MySQL Visual Studio Plugin works with Connector/NET and
+ Visual Studio 2005. The plugin is a MySQL DDEX Provider, which
+ means that you can use the schema and data manipulation tools
+ within Visual Studio to create and edit objects within a MySQL
+ database.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Connector/J provides driver support for connecting to MySQL from
a Java application using the standard Java Database Connectivity
(JDBC) API.
@@ -95,14 +109,16 @@
the <xref linkend="apis"/> chapter.
</para>
- <xi:include href="connector-odbc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-odbc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-net.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-net.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-j.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-vstudioplugin.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-j.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-php.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-php.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
</chapter>
Modified: branches/telcos/refman-5.1/Makefile
===================================================================
--- branches/telcos/refman-5.1/Makefile 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/Makefile 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 8404 bytes
@@ -42,7 +42,7 @@
MANUAL_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent ../common/phrases.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis-cplusplus.xml apis-c.xml apis-eiffel.xml apis-libmysqld.xml apis-perl.xml apis-php.xml apis-progutils.xml apis-python.xml apis-tcl.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml connector-vstudioplugin.xml copyright.xml database-administration.xml data-types.xml dba-optvars-table.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml events.xml extending-mysql.xml faqs.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-replication-binlog-injector.png images/cluster-replication-overview.png images/cluster-upgrade-downgrade-table.png images/cmxj-overview.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/multi-comp-1.png images/myaccess-odbc.png im!
ages/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-crystal-1.png images/myodbc-crystal-2.png images/myodbc-crystal-3.png images/myodbc-crystal-4.png images/myodbc-crystal-5.png images/myodbc-crystal-6.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-wi!
n-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driversel!
ect.png
images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/mysql-vstudioplugin-1.png images/mysql-vstudioplugin-3.png images/mysql-vstudioplugin-4.png images/ndb-size-pl-1.png images/PSEArch.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/rolling-restarts.png information-schema.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news-5.1.xml news.xml optimization.xml partitioning.xml porting.xml precision-math.xml preface.xml problems.xml ../refman-common/bug-reports.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-connector-j.xml ../refman-common/news-connec!
tor-net.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/what-is.en.xml ../refman-common/what-is-mysql-ab.en.xml replication.xml reserved-new-5.1.xml reservedwords.xml restrictions.xml se-archive.xml se-blackhole.xml se-csv.xml se-example.xml se-federated.xml se-innodb.xml se-memory.xml se-merge.xml se-myisam.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis-cplusplus.xml apis-c.xml apis-eiffel.xml apis-libmysqld.xml apis-perl.xml apis-php.xml apis-progutils.xml apis-python.xml apis-tcl.xml apis.xml charset.xml client-utility-programs.xml connectors.xml copyright.xml database-administration.xml data-types.xml dba-optvars-table.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml events.xml extending-mysql.xml faqs.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-replication-binlog-injector.png images/cluster-replication-overview.png images/cluster-upgrade-downgrade-table.png images/multi-comp-1.png images/ndb-size-pl-1.png images/PSEArch.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/rolling-restarts.png information-schema.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news-5.1.xml news.xml optimization.xml partitioning.xml porting.xml precision-m!
ath.xml preface.xml problems.xml ../refman-common/bug-reports.xml ../refman-common/connector-j.xml ../refman-common/connector-mxj.xml ../refman-common/connector-net.xml ../refman-common/connector-odbc.xml ../refman-common/connector-php.xml ../refman-common/connector-vstudioplugin.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/images/cmxj-overview.png ../refman-common/images/cnet-win-install-step1.png ../refman-common/images/cnet-win-install-step2.png ../refman-common/images/cnet-win-install-step3.png ../refman-common/images/cnet-win-install-step4.png ../refman-common/images/cnet-win-install-step6.png ../refman-common/images/myaccess-odbc.png ../refman-common/images/myaccess.png ../refman-common/images/myarchitecture.png ../refman-common/images/myflowchart.png ../refman-common/images/myodbc-crystal-1.png ../refman-common/images/myodbc-crystal-2.png ../refman-common/images/myodbc-crystal-3.png ../r!
efman-common/images/myodbc-crystal-4.png ../refman-common/imag!
es/myodb
c-crystal-5.png ../refman-common/images/myodbc-crystal-6.png ../refman-common/images/myodbc-excel-step1.png ../refman-common/images/myodbc-excel-step2.png ../refman-common/images/myodbc-excel-step3.png ../refman-common/images/myodbc-excel-step4.png ../refman-common/images/myodbc-excel-step5.png ../refman-common/images/myodbc-macosx-install-step1.png ../refman-common/images/myodbc-macosx-install-step2.png ../refman-common/images/myodbc-macosx-install-step3.png ../refman-common/images/myodbc-macosx-install-step4.png ../refman-common/images/myodbc-macosx-install-step5.png ../refman-common/images/myodbc-macosx-install-step6.png ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png ../refman-common/images/myodbc-macosx-odbcadmin-main.png ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png ../refman-common/images/myodbc-win-install-step1.png ../refman-common/images/myodbc-win-install-step2.png ../refman-com!
mon/images/myodbc-win-install-step3.png ../refman-common/images/myodbc-win-install-step4.png ../refman-common/images/myodbc-win-odbcadmin-adddsn.png ../refman-common/images/myodbc-win-odbcadmin-advanced.png ../refman-common/images/myodbc-win-odbcadmin-driverselect.png ../refman-common/images/myodbc-win-odbcadmin-main.png ../refman-common/images/myodbc-win-odbcadmin-options.png ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png ../refman-common/images/myodbc-win-tracing.png ../refman-common/images/mysql-vstudioplugin-1.png ../refman-common/images/mysql-vstudioplugin-3.png ../refman-common/images/mysql-vstudioplugin-4.png ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/what-is.en.xml ../refman-common!
/what-is-mysql-ab.en.xml replication.xml reserved-new-5.1.xml !
reserved
words.xml restrictions.xml se-archive.xml se-blackhole.xml se-csv.xml se-example.xml se-federated.xml se-innodb.xml se-memory.xml se-merge.xml se-myisam.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml
manual-prepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS)
manual-manprepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS)
Modified: branches/telcos/refman-5.1/client-utility-programs.xml
===================================================================
--- branches/telcos/refman-5.1/client-utility-programs.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/client-utility-programs.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 642 bytes
@@ -11464,7 +11464,7 @@
specified explicitly using the
<option>--fields-<replaceable>xxx</replaceable></option>
and
- <option>--lines--<replaceable>xxx</replaceable></option>
+ <option>--lines-terminated-by</option>
options.
</para>
Modified: branches/telcos/refman-5.1/connectors.xml
===================================================================
--- branches/telcos/refman-5.1/connectors.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/connectors.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 6; 1500 bytes
@@ -109,16 +109,16 @@
the <xref linkend="apis"/> chapter.
</para>
- <xi:include href="connector-odbc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-odbc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-net.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-net.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-vstudioplugin.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-vstudioplugin.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-j.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-j.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="connector-php.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/connector-php.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</chapter>
Modified: branches/telcos/refman-5.1/database-administration.xml
===================================================================
--- branches/telcos/refman-5.1/database-administration.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/database-administration.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 5, Lines Added: 27, Lines Deleted: 24; 4570 bytes
@@ -8670,12 +8670,14 @@
<para>
The server maintains many status variables that provide
information about its operation. You can view these variables
- and their values by using the <literal>SHOW STATUS</literal>
- statement:
+ and their values by using the <literal>SHOW [GLOBAL]
+ STATUS</literal> statement. The optional
+ <literal>GLOBAL</literal> keyword aggregates the values over
+ all connections.
</para>
<programlisting>
-mysql> <userinput>SHOW STATUS;</userinput>
+mysql> <userinput>SHOW GLOBAL STATUS;</userinput>
+-----------------------------------+------------+
| Variable_name | Value |
+-----------------------------------+------------+
@@ -10568,17 +10570,17 @@
<para>
Allow spaces between a function name and the
‘<literal>(</literal>’ character. This causes
- function names to be treated as reserved words. As a
- result, identifiers that are the same as function names
- must be quoted as described in
+ built-in function names to be treated as reserved words.
+ As a result, identifiers that are the same as function
+ names must be quoted as described in
<xref linkend="identifiers"/>. For example, because there
- is a <literal>ABS()</literal> function, the use of
- <literal>abs</literal> as a table name in the following
+ is a <literal>COUNT()</literal> function, the use of
+ <literal>count</literal> as a table name in the following
statement causes an error:
</para>
<programlisting>
-mysql> <userinput>CREATE TABLE abs (i INT);</userinput>
+mysql> <userinput>CREATE TABLE count (i INT);</userinput>
ERROR 1064 (42000): You have an error in your SQL syntax
</programlisting>
@@ -10587,17 +10589,22 @@
</para>
<programlisting>
-mysql> <userinput>CREATE TABLE `abs` (i INT);</userinput>
+mysql> <userinput>CREATE TABLE `count` (i INT);</userinput>
Query OK, 0 rows affected (0.00 sec)
</programlisting>
<para>
The <literal>IGNORE_SPACE</literal> SQL mode applies to
built-in functions, not to user-defined functions or
- stored routines. It is always allowable to have spaces
- after a UDF or routine name, regardless of whether
+ stored functions. It is always allowable to have spaces
+ after a UDF or stored function name, regardless of whether
<literal>IGNORE_SPACE</literal> is enabled.
</para>
+
+ <para>
+ For further discussion of <literal>IGNORE_SPACE</literal>,
+ see <xref linkend="function-resolution"/>.
+ </para>
</listitem>
<listitem>
@@ -28944,15 +28951,8 @@
</para>
<para>
- Cache entries for transactional <literal>InnoDB</literal> tables
- that have been changed are invalidated when a
- <literal>COMMIT</literal> is performed.
- </para>
-
- <para>
The query cache also works within transactions when using
- <literal>InnoDB</literal> tables, making use of the table
- version number to detect whether its contents are still current.
+ <literal>InnoDB</literal> tables.
</para>
<para>
@@ -28962,10 +28962,13 @@
<para>
The query cache works for <literal>SELECT SQL_CALC_FOUND_ROWS
- ...</literal> and <literal>SELECT FOUND_ROWS()</literal> type
- queries. <literal>FOUND_ROWS()</literal> returns the correct
- value even if the preceding query was fetched from the cache
- because the number of found rows is also stored in the cache.
+ ...</literal> queries and stores a value that a following
+ <literal>SELECT FOUND_ROWS()</literal> query returns.
+ <literal>FOUND_ROWS()</literal> returns the correct value even
+ if the preceding query was fetched from the cache because the
+ number of found rows is also stored in the cache. The
+ <literal>SELECT FOUND_ROWS()</literal> query itself cannot be
+ cached.
</para>
<para>
Modified: branches/telcos/refman-5.1/events.xml
===================================================================
--- branches/telcos/refman-5.1/events.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/events.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 0; 816 bytes
@@ -931,6 +931,13 @@
</programlisting>
<para>
+ MySQL stores the <literal>sql_mode</literal> system variable
+ setting that is in effect at the time an event is created, and
+ always executes the event with this setting in force,
+ <emphasis>regardless of the current server SQL mode</emphasis>.
+ </para>
+
+ <para>
A <literal>CREATE EVENT</literal> statement that contains an
<literal>ALTER EVENT</literal> statement in its
<literal>DO</literal> clause appears to succeed; however, when
Modified: branches/telcos/refman-5.1/functions.xml
===================================================================
--- branches/telcos/refman-5.1/functions.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/functions.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 930 bytes
@@ -4279,7 +4279,7 @@
<remark role="help-syntax-begin"/>
- <para id="function_rlike">
+ <para id="function_regexp">
<indexterm>
<primary>mSQL compatibility</primary>
</indexterm>
@@ -4770,7 +4770,7 @@
<remark role="help-syntax-begin"/>
- <para>
+ <para id="function_mod2">
<indexterm>
<primary>%</primary>
</indexterm>
@@ -7073,7 +7073,7 @@
<remark role="help-syntax-begin"/>
- <para>
+ <para id="function_date_sub">
<indexterm>
<primary>DATE_SUB()</primary>
</indexterm>
Modified: branches/telcos/refman-5.1/installing.xml
===================================================================
--- branches/telcos/refman-5.1/installing.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/installing.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 15, Lines Added: 167, Lines Deleted: 83; 15983 bytes
@@ -843,11 +843,6 @@
<itemizedlist>
- <remark role="todo">
- remove "virtually" when Cygwin becomes unnecessary for
- Windows
- </remark>
-
<listitem>
<para>
An internal test suite
@@ -855,10 +850,9 @@
<para>
The <filename>mysql-test</filename> directory contains an
- extensive set of test cases. We run these tests for
- virtually every server binary. See
- <xref linkend="mysql-test-suite"/>, for more information
- about this test suite.
+ extensive set of test cases. We run these tests for every
+ server binary. See <xref linkend="mysql-test-suite"/>, for
+ more information about this test suite.
</para>
</listitem>
@@ -8286,7 +8280,13 @@
To obtain our most recent development source tree, first
download and install the BitKeeper free client if you do not
have it. The client can be obtained from
- <ulink url="http://www.bitmover.com/bk-client.shar"/>.
+ <ulink url="http://www.bitmover.com/bk-client2.0.shar"/>. Note
+ that you will need <literal>gcc</literal> and
+ <literal>make</literal> to build the BitKeeper free client, and
+ <command>patch</command> and <command>tar</command> to use the
+ BitKeeper free client. <emphasis role="deprecated">Note that old
+ 1.1 versions of the BitKeeper free client will not
+ work!</emphasis>
</para>
<para>
@@ -8294,13 +8294,30 @@
</para>
<programlisting>
-shell> <userinput>sh bk-client.shar</userinput>
-shell> <userinput>cd bk_client-1.1</userinput>
-shell> <userinput>make all</userinput>
-shell> <userinput>PATH=$PWD:$PATH</userinput>
+shell> <userinput>/bin/sh bk-client2.0.shar</userinput>
+shell> <userinput>cd bk-client2.0</userinput>
+shell> <userinput>make</userinput>
</programlisting>
<para>
+ If you get a <literal>cc: command not found</literal> error,
+ invoke this command before running <literal>make</literal>:
+ </para>
+
+<programlisting>
+shell> <userinput>make CC=gcc</userinput>
+</programlisting>
+
+ <para>
+ The step above will create the utility <command>bkf</command>,
+ which is the BitKeeper free client. You may use the BitKeeper
+ free client in the same way as the main client. For more
+ information on <command>bkf</command>, use:
+ </para>
+
+<programlisting>shell> bkf --help</programlisting>
+
+ <para>
To install the BitKeeper client on Windows, use these
instructions:
</para>
@@ -8316,44 +8333,21 @@
<listitem>
<para>
- Make sure <command>gcc</command> and <command>make</command>
- have been installed under Cygwin. You can test this by
- issuing <command>which gcc</command> and <command>which
- make</command> commands. If either one is not installed, run
- Cygwin's package manager, select <command>gcc</command>,
- <command>make</command>, or both, and install them.
+ Make sure <command>patch</command>, <command>tar</command>,
+ <command>gcc</command> and <command>make</command> have been
+ installed under Cygwin. You can test this by issuing
+ <command>which <replaceable>gcc</replaceable></command> for
+ each command. If a required tool is not installed, run
+ Cygwin's package manager, select the required tools and
+ install them.
</para>
</listitem>
<listitem>
<para>
- Under Cygwin, execute these commands:
+ For the installation of the BitKeeper free client, use the
+ same installations as given for Unix-like systems above.
</para>
-
-<programlisting>
-shell> <userinput>sh bk-client.shar</userinput>
-shell> <userinput>cd bk_client-1.1</userinput>
-</programlisting>
-
- <para>
- Then edit the <filename>Makefile</filename> and change the
- line that reads <literal>$(CC) $(CFLAGS) -o sfio -lz
- sfio.c</literal> to this:
- </para>
-
-<programlisting>
-$(CC) $(CFLAGS) -o sfio sfio.c -lz
-</programlisting>
-
- <para>
- Now run the <command>make</command> command and set the
- path:
- </para>
-
-<programlisting>
-shell> <userinput>make all</userinput>
-shell> <userinput>PATH=$PWD:$PATH</userinput>
-</programlisting>
</listitem>
</orderedlist>
@@ -8379,7 +8373,7 @@
</para>
<programlisting>
-shell> <userinput>sfioball -r+ bk://mysql.bkbits.net/mysql-¤t-series; mysql-¤t-series;</userinput>
+shell> <userinput>bkf clone bk://mysql.bkbits.net/mysql-¤t-series; mysql-¤t-series;</userinput>
</programlisting>
<para>
@@ -8576,28 +8570,42 @@
<listitem>
<para>
After initially copying the repository with
- <command>sfioball</command> to obtain the source tree, you
- should use <command>update</command> periodically to update
+ <command>bkf</command> to obtain the source tree, you should
+ use <command>pull</command> option to periodically update
your local copy. To do this any time after you have set up
the repository, use this command:
</para>
<programlisting>
-shell> <userinput>update bk://mysql.bkbits.net/mysql-¤t-series;</userinput>
+shell> <userinput>bkf pull</userinput>
</programlisting>
</listitem>
<listitem>
<para>
- You can examine the change history for the tree with all the
- diffs by viewing the <filename>BK/ChangeLog</filename> file
- in the source tree and looking at the
- <literal>ChangeSet</literal> descriptions listed there. To
- examine a particular changeset, you would have to use the
- <command>sfioball</command> command to extract two
- particular revisions of the source tree, and then use an
- external <command>diff</command> command to compare them. If
- you see some funny diffs or code that you have a question
+ You can examine the changeset comments for the tree by using
+ the <literal>changes</literal> option to
+ <command>bkf</command>:
+ </para>
+
+<programlisting>shell> bkf changes</programlisting>
+
+ <para>
+ To get a list of the changes that would be applied with the
+ next <literal>bkf pull</literal>:
+ </para>
+
+<programlisting>shell> bkf changes -R</programlisting>
+
+ <para>
+ To obtain a patch file for a specific changeset
+ (<literal>CSETID</literal>), use:
+ </para>
+
+<programlisting>shell> bkf changes -vvr<replaceable>CSETID</replaceable></programlisting>
+
+ <para>
+ If you see diffs or code that you have a question
about, do not hesitate to send email to the MySQL
<literal>internals</literal> mailing list. See
<xref linkend="mailing-lists"/>. Also, if you think you have
@@ -9302,11 +9310,11 @@
<para>
<emphasis role="bold">Note</emphasis>: The instructions here are
- strictly for users who want to test MySQL on Windows from the
- latest source distribution or from the BitKeeper tree. For
- production use, MySQL AB does not advise using a MySQL server
- built by yourself from source. Normally, it is best to use
- precompiled binary distributions of MySQL that are built
+ strictly for users who want to test MySQL on Microsoft Windows
+ from the latest source distribution or from the BitKeeper tree.
+ For production use, MySQL AB does not advise using a MySQL
+ server built by yourself from source. Normally, it is best to
+ use precompiled binary distributions of MySQL that are built
specifically for optimal performance on Windows by MySQL AB.
Instructions for installing a binary distributions are available
in <xref linkend="windows-installation"/>.
@@ -9321,7 +9329,7 @@
<listitem>
<para>
- CMake. It can be downloaded from
+ CMake, which can be downloaded from
<ulink url="http://www.cmake.org">http://www.cmake.org</ulink>.
After installing, modify your path to include the cmake
binary.
@@ -9330,34 +9338,44 @@
<listitem>
<para>
- If compiling from from a BitKeeper tree or doing changes to
- the parser you need <literal>bison</literal> for Windows. It
- can be downloaded from
+ If compiling from from a BitKeeper tree or making changes to
+ the parser you need <literal>bison</literal> for Windows,
+ which can be downloaded from
<ulink
url="http://gnuwin32.sourceforge.net/packages/bison.htm">http://gnuwin32.sourceforge.net/packages/bison.htm</ulink>.
- Download the <literal>Complete package, excluding
- sources</literal> package. After installing, modify your
- path to include the <literal>bison</literal> binary and
+ Download the package labelled <quote>Complete package,
+ excluding sources</quote>. After installing, modify your
+ path to include the <command>bison</command> binary and
ensure that this binary is accessible from Visual Studio.
</para>
</listitem>
<listitem>
<para>
- Visual C++ 2005 Express Edition, Visual Studio .Net 2003
- (7.1) or Visual Studio 2005 (8.0) compiler system.
+ Microsoft Visual C++ 2005 Express Edition, Visual Studio
+ .Net 2003 (7.1) or Visual Studio 2005 (8.0) compiler system.
</para>
</listitem>
<listitem>
<para>
+ If you are using Visual C++ 2005 Express Edition you must
+ also install an appropriate Platform SDK. More information
+ and links to downloads for various Windows platforms is
+ available from
+ <ulink url="http://msdn.microsoft.com/platformsdk/">http://msdn.microsoft.com/platformsdk/</ulink>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Between 3GB and 5GB disk space.
</para>
</listitem>
<listitem>
<para>
- Windows XP, Windows 2000 or higher.
+ Windows 2000, Windows XP, or newer version.
</para>
</listitem>
@@ -9388,7 +9406,7 @@
<para>
You can package a source distribution yourself from the
latest BitKeeper developer source tree. For instructions on
- pulling the latest source files see
+ pulling the latest source files, see
<xref
linkend="installing-source-tree"/>.
</para>
@@ -9439,35 +9457,35 @@
<listitem>
<para>
<literal>WITH_INNOBASE_STORAGE_ENGINE</literal> - Enable
- the InnoDB storage engine.
+ the <literal>InnoDB</literal> storage engine.
</para>
</listitem>
<listitem>
<para>
<literal>WITH_PARTITION_STORAGE_ENGINE</literal> -
- Enable the Partition storage engine.
+ Enable user-defined partitioning.
</para>
</listitem>
<listitem>
<para>
<literal>WITH_ARCHIVE_STORAGE_ENGINE</literal> - Enable
- the Archive storage engine.
+ the <literal>ARCHIVE</literal> storage engine.
</para>
</listitem>
<listitem>
<para>
<literal>WITH_BLACKHOLE_STORAGE_ENGINE</literal> Enable
- the Blackhole storage engine.
+ the <literal>BLACKHOLE</literal> storage engine.
</para>
</listitem>
<listitem>
<para>
<literal>WITH_EXAMPLE_STORAGE_ENGINE</literal> - Enable
- the Example storage engine.
+ the <literal>EXAMPLE</literal> storage engine.
</para>
</listitem>
@@ -9480,7 +9498,8 @@
<listitem>
<para>
- <literal>__NT__</literal> - Enable named pipe support.
+ <literal>__NT__</literal> - Enable support for named
+ pipes.
</para>
</listitem>
@@ -9512,8 +9531,7 @@
</para>
<programlisting>
-win\configure WITH_INNOBASE_STORAGE_ENGINE WITH_PARTITION_STORAGE_ENGINE »
- MYSQL_SERVER_SUFFIX=-pro
+win\configure WITH_INNOBASE_STORAGE_ENGINE WITH_PARTITION_STORAGE_ENGINE MYSQL_SERVER_SUFFIX=-pro
</programlisting>
</listitem>
@@ -12094,6 +12112,72 @@
<listitem>
<para>
+ <emphasis role="bold">Incompatible change</emphasis>: The
+ number of function names affected by
+ <literal>IGNORE_SPACE</literal> was reduced significantly in
+ MySQL 5.1.13, from about 200 to about 30. (For details about
+ <literal>IGNORE_SPACE</literal>, see
+ <xref linkend="function-resolution"/>.) This change improves
+ the consistency of parser operation. However, it also
+ introduces the possibility of incompatibility for old SQL
+ code that relies on the following conditions:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <literal>IGNORE_SPACE</literal> is disabled.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ The presence or absence of whitespace following a
+ function name is used to distinguish between a built-in
+ function and stored function that have the same name
+ (for example, <literal>PI()</literal> versus <literal>PI
+ ()</literal>).
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ For functions that are no longer affected by
+ <literal>IGNORE_SPACE</literal> as of MySQL 5.1.13, that
+ strategy no longer works. Either of the following approaches
+ can be used if you have code that is subject to the
+ preceding incompatibility:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ If a stored function has a name that conflicts with a
+ built-in function, refer to the stored function with a
+ schema name qualifier, regardless of whether whitespace
+ is present. For example, write
+ <literal><replaceable>schema_name</replaceable>.PI()</literal>
+ or <literal><replaceable>schema_name</replaceable>.PI
+ ()</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Alternatively, rename the stored function to use a
+ non-conflicting name and change invocations of the
+ function to use the new name.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>
<emphasis role="bold">Incompatible change</emphasis>: For
<literal>utf8</literal> columns, the full-text parser
incorrectly considered several non-word punctuation and
Modified: branches/telcos/refman-5.1/language-structure.xml
===================================================================
--- branches/telcos/refman-5.1/language-structure.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/language-structure.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 6, Lines Added: 458, Lines Deleted: 63; 21692 bytes
@@ -1005,6 +1005,11 @@
</programlisting>
<para>
+ Identifiers may begin with a digit but unless quoted may not
+ consist solely of digits.
+ </para>
+
+ <para>
It is recommended that you do not use names of the form
<literal><replaceable>M</replaceable>e</literal> or
<literal><replaceable>M</replaceable>e<replaceable>N</replaceable></literal>,
@@ -1528,19 +1533,419 @@
<section id="function-resolution">
- <title>Function Name Resolution</title>
+ <title>Function Name Parsing and Resolution</title>
+ <indexterm>
+ <primary>function names</primary>
+ <secondary>parsing</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>function names</primary>
+ <secondary>resolving ambiguity</secondary>
+ </indexterm>
+
<para>
MySQL ¤t-series; supports built-in (native) functions,
- user-defined functions (UDFs), and stored functions. The
- following rules describe how the server resolves references to
- function names for function creation and invocation:
+ user-defined functions (UDFs), and stored functions. This
+ section describes how the server recognizes whether the name of
+ a built-in function is used as a function call or as an
+ identifier, and how the server determines which function to use
+ in cases when functions of different types exist with a given
+ name.
</para>
+ <para>
+ <emphasis role="bold">Built-In Function Name Parsing</emphasis>
+ </para>
+
+ <para>
+ The parser uses default rules for parsing names of built-in
+ functions. These rules can be changed by enabling the
+ <literal>IGNORE_SPACE</literal> SQL mode.
+ </para>
+
+ <para>
+ When the parser encounters a word that is the name of a built-in
+ function, it must determine whether the name signifies a
+ function call or is instead a non-expression reference to an
+ identifier such as a table or column name. For example, in the
+ following statements, the first reference to
+ <literal>count</literal> is a function call, whereas the second
+ reference is a table name:
+ </para>
+
+<programlisting>
+SELECT COUNT(*) FROM mytable;
+CREATE TABLE count (i INT);
+</programlisting>
+
+ <para>
+ The parser should recognize the name of a built-in function as
+ indicating a function call only when parsing what is expected to
+ be an expression. That is, in non-expression context, function
+ names are permitted as identifiers.
+ </para>
+
+ <para>
+ However, some built-in functions have special parsing or
+ implementation considerations, so the parser uses the following
+ rules by default to distinguish whether their names are being
+ used as function calls or as identifiers in non-expression
+ context:
+ </para>
+
<itemizedlist>
<listitem>
<para>
+ To use the name as a function call in an expression, there
+ must be no whitespace between the name and the following
+ ‘<literal>(</literal>’ parenthesis character.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Conversely, to use the function name as an identifier, it
+ must not be followed immediately by a parenthesis.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ The requirement that function calls be written with no
+ whitespace between the name and the parenthesis applies only to
+ the built-in functions that have special considerations.
+ <literal>COUNT</literal> is one such name. The exact list of
+ function names for which following whitespace determines their
+ interpretation are those listed in the
+ <literal>sql_functions[]</literal> array of the
+ <filename>sql/lex.h</filename> source file. Before MySQL 5.1,
+ they are rather numerous (about 200), so you may find it easiest
+ to treat the no-whitespace requirement as applying to all
+ function calls. In MySQL 5.1, parser improvements reduce to
+ about 30 the number of affected function names.
+ </para>
+
+ <para>
+ For functions not listed in the
+ <literal>sql_functions[]</literal>) array, whitespace does not
+ matter. They are interpreted as function calls only when used in
+ expression context and may be used freely as identifiers
+ otherwise. <literal>ASCII</literal> is one such name. However,
+ for these non-affected function names, interpretation may vary
+ in expression context:
+ <literal><replaceable>func_name</replaceable> ()</literal> is
+ interpreted as a built-in function if there is one; if not,
+ <literal><replaceable>func_name</replaceable> ()</literal> is
+ interpreted as a user-defined function or stored function if one
+ exists with that name.
+ </para>
+
+ <para>
+ The <literal>IGNORE_SPACE</literal> SQL mode can be used to
+ modify how the parser treats function names that are
+ whitespace-sensitive:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ With <literal>IGNORE_SPACE</literal> disabled, the parser
+ interprets the name as a function call when there is no
+ whitespace between the name and the following parenthesis.
+ This occurs even when the function name is used in
+ non-expression context:
+ </para>
+
+<programlisting>
+mysql> <userinput>CREATE TABLE count(i INT);</userinput>
+ERROR 1064 (42000): You have an error in your SQL syntax ...
+near 'count(i INT)'
+</programlisting>
+
+ <para>
+ To eliminate the error and cause the name to be treated as
+ an identifier, either use whitespace following the name or
+ write it as a quoted identifier (or both):
+ </para>
+
+<programlisting>
+CREATE TABLE count (i INT);
+CREATE TABLE `count`(i INT);
+CREATE TABLE `count` (i INT);
+</programlisting>
+ </listitem>
+
+ <listitem>
+ <para>
+ With <literal>IGNORE_SPACE</literal> enabled, the parser
+ loosens the requirement that there be no whitespace between
+ the function name and the following parenthesis. This
+ provides more flexibility in writing function calls. For
+ example, either of the following function calls are legal:
+ </para>
+
+<programlisting>
+SELECT COUNT(*) FROM mytable;
+SELECT COUNT (*) FROM mytable;
+</programlisting>
+
+ <para>
+ However, enabling <literal>IGNORE_SPACE</literal> also has
+ the side effect that the parser treats the affected function
+ names as reserved words (see
+ <xref linkend="reserved-words"/>). This means that a space
+ following the name no longer signifies its use as an
+ identifier. The name can be used in function calls with or
+ without following whitespace, but causes a syntax error in
+ non-expression context unless it is quoted. For example,
+ with <literal>IGNORE_SPACE</literal> enabled, both of the
+ following statements fail with a syntax error because the
+ parser interprets <literal>count</literal> as a reserved
+ word:
+ </para>
+
+<programlisting>
+CREATE TABLE count(i INT);
+CREATE TABLE count (i INT);
+</programlisting>
+
+ <para>
+ To use the function name in non-expression context, write it
+ as a quoted identifier:
+ </para>
+
+<programlisting>
+CREATE TABLE `count`(i INT);
+CREATE TABLE `count` (i INT);
+</programlisting>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ To enable the <literal>IGNORE_SPACE</literal> SQL mode, use this
+ statement:
+ </para>
+
+<programlisting>
+SET sql_mode = 'IGNORE_SPACE';
+</programlisting>
+
+ <para>
+ <literal>IGNORE_SPACE</literal> is also enabled by certain other
+ composite modes such as <literal>ANSI</literal> that include it
+ in their value:
+ </para>
+
+<programlisting>
+SET sql_mode = 'ANSI';
+</programlisting>
+
+ <para>
+ Check <xref linkend="server-sql-mode"/>, to see which composite
+ modes enable <literal>IGNORE_SPACE</literal>.
+ </para>
+
+ <para>
+ To minimize the dependency of SQL code on the
+ <literal>IGNORE_SPACE</literal> setting, use these guidelines:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ Avoid creating UDFs or stored functions that have the same
+ name as a built-in function.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Avoid using function names in non-expression context. For
+ example, these statements use <literal>count</literal> (one
+ of the affected function names affected by
+ <literal>IGNORE_SPACE</literal>), so they fail with or
+ without whitespace following the name if
+ <literal>IGNORE_SPACE</literal> is enabled:
+ </para>
+
+<programlisting>
+CREATE TABLE count(i INT);
+CREATE TABLE count (i INT);
+</programlisting>
+
+ <para>
+ If you must use a function name in non-expression context,
+ write it as a quoted identifier:
+ </para>
+
+<programlisting>
+CREATE TABLE `count`(i INT);
+CREATE TABLE `count` (i INT);
+</programlisting>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ The number of function names affected by
+ <literal>IGNORE_SPACE</literal> was reduced significantly in
+ MySQL 5.1.13, from about 200 to about 30. As of MySQL 5.1.13,
+ only the following functions are still affected by the
+ <literal>IGNORE_SPACE</literal> setting:
+ </para>
+
+ <informaltable>
+ <tgroup cols="3">
+ <colspec colwidth="33*"/>
+ <colspec colwidth="33*"/>
+ <colspec colwidth="33*"/>
+ <tbody>
+ <row>
+ <entry><literal>ADDDATE</literal></entry>
+ <entry><literal>BIT_AND</literal></entry>
+ <entry><literal>BIT_OR</literal></entry>
+ </row>
+ <row>
+ <entry><literal>BIT_XOR</literal></entry>
+ <entry><literal>CAST</literal></entry>
+ <entry><literal>COUNT</literal></entry>
+ </row>
+ <row>
+ <entry><literal>CURDATE</literal></entry>
+ <entry><literal>CURTIME</literal></entry>
+ <entry><literal>DATE_ADD</literal></entry>
+ </row>
+ <row>
+ <entry><literal>DATE_SUB</literal></entry>
+ <entry><literal>EXTRACT</literal></entry>
+ <entry><literal>GROUP_CONCAT</literal></entry>
+ </row>
+ <row>
+ <entry><literal>MAX</literal></entry>
+ <entry><literal>MID</literal></entry>
+ <entry><literal>MIN</literal></entry>
+ </row>
+ <row>
+ <entry><literal>NOW</literal></entry>
+ <entry><literal>POSITION</literal></entry>
+ <entry><literal>SESSION_USER</literal></entry>
+ </row>
+ <row>
+ <entry><literal>STD</literal></entry>
+ <entry><literal>STDDEV</literal></entry>
+ <entry><literal>STDDEV_POP</literal></entry>
+ </row>
+ <row>
+ <entry><literal>STDDEV_SAMP</literal></entry>
+ <entry><literal>SUBDATE</literal></entry>
+ <entry><literal>SUBSTR</literal></entry>
+ </row>
+ <row>
+ <entry><literal>SUBSTRING</literal></entry>
+ <entry><literal>SUM</literal></entry>
+ <entry><literal>SYSDATE</literal></entry>
+ </row>
+ <row>
+ <entry><literal>SYSTEM_USER</literal></entry>
+ <entry><literal>TRIM</literal></entry>
+ <entry><literal>VARIANCE</literal></entry>
+ </row>
+ <row>
+ <entry><literal>VAR_POP</literal></entry>
+ <entry><literal>VAR_SAMP</literal></entry>
+ <entry/>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+
+ <para>
+ For earlier versions of MySQL, check the contents of the
+ <literal>sql_functions[]</literal> array in the
+ <filename>sql/lex.h</filename> source file to see which
+ functions are affected by <literal>IGNORE_SPACE</literal>.
+ </para>
+
+ <para>
+ <emphasis role="bold">Incompatibility warning</emphasis>: The
+ change in MySQL 5.1.13 that reduces the number of function names
+ affected by <literal>IGNORE_SPACE</literal> improves the
+ consistency of parser operation. However, it also introduces the
+ possibility of incompatibility for old SQL code that relies on
+ the following conditions:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <literal>IGNORE_SPACE</literal> is disabled.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ The presence or absence of whitespace following a function
+ name is used to distinguish between a built-in function and
+ stored function that have the same name (for example,
+ <literal>PI()</literal> versus <literal>PI ()</literal>).
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ For functions that are no longer affected by
+ <literal>IGNORE_SPACE</literal> as of MySQL 5.1.13, that
+ strategy no longer works. Either of the following approaches can
+ be used if you have code that is subject to the preceding
+ incompatibility:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ If a stored function has a name that conflicts with a
+ built-in function, refer to the stored function with a
+ schema name qualifier, regardless of whether whitespace is
+ present. For example, write
+ <literal><replaceable>schema_name</replaceable>.PI()</literal>
+ or <literal><replaceable>schema_name</replaceable>.PI
+ ()</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Alternatively, rename the stored function to use a
+ non-conflicting name and change invocations of the function
+ to use the new name.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ <emphasis role="bold">Function Name Resolution</emphasis>
+ </para>
+
+ <para>
+ The following rules describe how the server resolves references
+ to function names for function creation and invocation:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
Built-in functions and user-defined functions
</para>
@@ -1593,21 +1998,37 @@
<para>
The preceding function name resolution rules have implications
for upgrading to versions of MySQL that implement new built-in
- functions. If you have already created a user-defined function
- with a given name and upgrade MySQL to a version that implements
- a new built-in function with the same name, the UDF becomes
- inaccessible. To correct this, use <literal>DROP
- FUNCTION</literal> to drop the UDF, and then use <literal>CREATE
- FUNCTION</literal> to re-create the UDF with a different
- non-conflicting name. If a new version of MySQL implements a
- built-in function with the same name as an existing stored
- function, you have two choices: Rename the stored function to
- use a non-conflicting name, or change calls to the function so
- that they use a schema qualifier (that is, use
- <literal><replaceable>schema_name</replaceable>.<replaceable>func_name</replaceable>()</literal>
- syntax).
+ functions:
</para>
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ If you have already created a user-defined function with a
+ given name and upgrade MySQL to a version that implements a
+ new built-in function with the same name, the UDF becomes
+ inaccessible. To correct this, use <literal>DROP
+ FUNCTION</literal> to drop the UDF, and then use
+ <literal>CREATE FUNCTION</literal> to re-create the UDF with
+ a different non-conflicting name.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ If a new version of MySQL implements a built-in function
+ with the same name as an existing stored function, you have
+ two choices: Rename the stored function to use a
+ non-conflicting name, or change calls to the function so
+ that they use a schema qualifier (that is, use
+ <literal><replaceable>schema_name</replaceable>.<replaceable>func_name</replaceable>()</literal>
+ syntax).
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
</section>
</section>
@@ -1625,11 +2046,11 @@
</indexterm>
<para>
- A common problem stems from trying to use an identifier such as a
- table or column name that is a reserved word such as
- <literal>SELECT</literal> or the name of a built-in MySQL data
- type or function such as <literal>TIMESTAMP</literal> or
- <literal>GROUP</literal>.
+ Certain words such as <literal>SELECT</literal>,
+ <literal>DELETE</literal>, or <literal>BIGINT</literal> are
+ reserved and require special treatment for use as identifiers such
+ as table and column names. This may also be true for the names of
+ built-in functions.
</para>
<para>
@@ -1639,9 +2060,8 @@
<programlisting>
mysql> <userinput>CREATE TABLE interval (begin INT, end INT);</userinput>
-ERROR 1064 (42000): You have an error in your SQL syntax; check
-the manual that corresponds to your MySQL server version for
-the right syntax to use near 'interval (begin INT, end INT)'
+ERROR 1064 (42000): You have an error in your SQL syntax ...
+near 'interval (begin INT, end INT)'
mysql> <userinput>CREATE TABLE `interval` (begin INT, end INT);</userinput>
Query OK, 0 rows affected (0.01 sec)
@@ -1649,53 +2069,28 @@
<para>
Exception: A word that follows a period in a qualified name must
- be an identifier, so it need not be quoted even if it is reserved.
+ be an identifier, so it need not be quoted even if it is reserved:
</para>
- <para>
- Function names are permitted as identifiers. For example,
- <literal>ABS</literal> is acceptable as a column name. However, by
- default, no whitespace is allowed in function invocations between
- the function name and the following
- ‘<literal>(</literal>’ character. This requirement
- enables the parser to distinguish whether the name is used in a
- function call or in non-function context.
- </para>
-
- <para>
- A side effect of this requirement is that omitting a space in some
- contexts causes the parser to interpret an identifier as a
- function name. For example, this statement is legal:
- </para>
-
<programlisting>
-mysql> <userinput>CREATE TABLE abs (val INT);</userinput>
+mysql> <userinput>CREATE TABLE mydb.interval (begin INT, end INT);</userinput>
+Query OK, 0 rows affected (0.01 sec)
</programlisting>
<para>
- But omitting the space after <literal>abs</literal> results in a
- syntax error because the statement then appears to invoke the
- <literal>ABS()</literal> function:
+ Names of built-in functions are permitted as identifiers but may
+ require care to be used as such. For example,
+ <literal>COUNT</literal> is acceptable as a column name. However,
+ by default, no whitespace is allowed in function invocations
+ between the function name and the following
+ ‘<literal>(</literal>’ character. This requirement
+ enables the parser to distinguish whether the name is used in a
+ function call or in non-function context. For further detail on
+ recognition of function names, see
+ <xref linkend="function-resolution"/>.
</para>
-<programlisting>
-mysql> <userinput>CREATE TABLE abs(val INT);</userinput>
-ERROR 1064 (42000) at line 2: You have an error in your SQL
-syntax ... near 'abs(val INT)'
-</programlisting>
-
<para>
- If the <literal>IGNORE_SPACE</literal> SQL mode is enabled, the
- server allows function invocations to have whitespace between a
- function name and the following ‘<literal>(</literal>’
- character. This causes function names to be treated as reserved
- words. As a result, identifiers that are the same as function
- names must be quoted as described in
- <xref linkend="identifiers"/>. The server SQL mode is controlled
- as described in <xref linkend="server-sql-mode"/>.
- </para>
-
- <para>
The words in the following table are explicitly reserved in MySQL
¤t-series;. At some point, you might upgrade to a higher
version, so it's a good idea to have a look at future reserved
Modified: branches/telcos/refman-5.1/news-5.1.xml
===================================================================
--- branches/telcos/refman-5.1/news-5.1.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/news-5.1.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 4, Lines Added: 87, Lines Deleted: 7; 4660 bytes
@@ -8,6 +8,8 @@
%urls.entities;
<!ENTITY % phrases.entities SYSTEM "../common/phrases.ent">
%phrases.entities;
+ <!ENTITY % versions.entities SYSTEM "versions.ent">
+ %versions.entities;
]>
<section id="news-5-1-x">
@@ -1164,6 +1166,75 @@
<listitem>
<para>
+ <emphasis role="bold">Incompatible change</emphasis>: The
+ number of function names affected by
+ <literal>IGNORE_SPACE</literal> was reduced significantly in
+ MySQL 5.1.13, from about 200 to about 30. (For details about
+ <literal>IGNORE_SPACE</literal>, see
+ <xref linkend="function-resolution"/>.) This change improves
+ the consistency of parser operation. However, it also
+ introduces the possibility of incompatibility for old SQL code
+ that relies on the following conditions:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <literal>IGNORE_SPACE</literal> is disabled.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ The presence or absence of whitespace following a function
+ name is used to distinguish between a built-in function
+ and stored function that have the same name (for example,
+ <literal>PI()</literal> versus <literal>PI ()</literal>).
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ For functions that are no longer affected by
+ <literal>IGNORE_SPACE</literal> as of MySQL 5.1.13, that
+ strategy no longer works. Either of the following approaches
+ can be used if you have code that is subject to the preceding
+ incompatibility:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ If a stored function has a name that conflicts with a
+ built-in function, refer to the stored function with a
+ schema name qualifier, regardless of whether whitespace is
+ present. For example, write
+ <literal><replaceable>schema_name</replaceable>.PI()</literal>
+ or <literal><replaceable>schema_name</replaceable>.PI
+ ()</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Alternatively, rename the stored function to use a
+ non-conflicting name and change invocations of the
+ function to use the new name.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ (Bug #21114)
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
If the user specified the server options
<option>--max-connections=<replaceable>N</replaceable></option>
or
@@ -11715,13 +11786,13 @@
<literal>SUPER</literal> privilege has changed to a
requirement for the <literal>TRIGGER</literal> privilege.
After upgrading, be sure to update your grant tables as
- described in <xref linkend="mysql-fix-privilege-tables"/>.
- This process assigns the <literal>TRIGGER</literal> privilege
- to all accounts that had the <literal>SUPER</literal>
- privilege. (After updating, you might also consider whether
- any of those accounts no longer need
- <literal>SUPER</literal>.) If you fail to update the grant
- tables, triggers may fail when activated. (Bug #9142)
+ described in <xref linkend="mysql-fix-privilege-tables"/>. This
+ process assigns the <literal>TRIGGER</literal> privilege to
+ all accounts that had the <literal>SUPER</literal> privilege.
+ (After updating, you might also consider whether any of those
+ accounts no longer need <literal>SUPER</literal>.) If you fail
+ to update the grant tables, triggers may fail when activated.
+ (Bug #9142)
</para>
</listitem>
@@ -13057,6 +13128,15 @@
</para>
</listitem>
+ <listitem>
+ <para>
+ Added the <literal>SHOW FUNCTION CODE</literal> and
+ <literal>SHOW PROCEDURE CODE</literal> statements (available
+ only for servers that have been built with debugging support).
+ See <xref linkend="show-procedure-code"/>.
+ </para>
+ </listitem>
+
</itemizedlist>
<para>
Modified: branches/telcos/refman-5.1/optimization.xml
===================================================================
--- branches/telcos/refman-5.1/optimization.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/optimization.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 2, Lines Added: 40, Lines Deleted: 0; 1921 bytes
@@ -1402,6 +1402,30 @@
<listitem>
<para>
+ <literal>Impossible WHERE noticed after reading const
+ tables</literal>
+ </para>
+
+ <para>
+ MySQL has read all <literal>const</literal> (and
+ <literal>system</literal>) tables and notice that the
+ <literal>WHERE</literal> clause is always false.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>No tables</literal>
+ </para>
+
+ <para>
+ The query has no <literal>FROM</literal> clause, or has
+ a <literal>FROM DUAL</literal> clause.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<literal>Not exists</literal>
</para>
@@ -1462,6 +1486,22 @@
<listitem>
<para>
+ <literal>Select tables optimized away</literal>
+ </para>
+
+ <para>
+ The query contained only aggregate functions
+ (<literal>MIN()</literal>, <literal>MAX()</literal>)
+ that were all resolved using an index, or
+ <literal>COUNT(*)</literal> for
+ <literal>MyISAM</literal>, and no <literal>GROUP
+ BY</literal> clause. The optimizer determined that only
+ one row should be returned.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<literal>Using filesort</literal>
</para>
Modified: branches/telcos/refman-5.1/renamed-nodes.txt
===================================================================
--- branches/telcos/refman-5.1/renamed-nodes.txt 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/renamed-nodes.txt 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 2, Lines Added: 18, Lines Deleted: 5; 2361 bytes
@@ -324,7 +324,6 @@
system system-optimization
table-size full-table
year-2000-compliance y2k-issues
-
cjk-faq faqs-cjk
cjk-faq-question-marks faqs-cjk
cjk-faq-gb-charset-problems faqs-cjk
@@ -345,11 +344,25 @@
cjk-faq-fixing-cjk-problems faqs-cjk
cjk-faq-manual-translation faqs-cjk
cjk-faq-contact faqs-cjk
-
mysql-cluster-faq faqs-mysql-cluster
-
faq-security faqs-security
-
stored-procedure-replication-faq faqs-stored-routines-triggers-replication
-vairable-table variable-table
+varaible-table variable-table
variable-table variables-table
+se-falcon http://dev.mysql.com/doc/falcon/en/index.html
+se-falcon-features http://dev.mysql.com/doc/falcon/en/se-falcon-features.html
+se-falcon-configuration http://dev.mysql.com/doc/falcon/en/se-falcon-configuration.html
+se-falcon-createdb http://dev.mysql.com/doc/falcon/en/se-falcon-createdb.html
+se-falcon-createtable http://dev.mysql.com/doc/falcon/en/se-falcon-createtable.html
+se-falcon-principles http://dev.mysql.com/doc/falcon/en/se-falcon-principles.html
+se-falcon-principles-tablespace http://dev.mysql.com/doc/falcon/en/se-falcon-principles-tablespace.html
+se-falcon-principles-logging http://dev.mysql.com/doc/falcon/en/se-falcon-principles-logging.html
+se-falcon-principles-logging-rollback http://dev.mysql.com/doc/falcon/en/se-falcon-principles-logging-rollback.html
+se-falcon-principles-logging-groupcommit http://dev.mysql.com/doc/falcon/en/se-falcon-principles-logging-groupcommit.html
+se-falcon-principles-recovery http://dev.mysql.com/doc/falcon/en/se-falcon-principles-recovery.html
+se-falcon-principles-caches http://dev.mysql.com/doc/falcon/en/se-falcon-principles-caches.html
+se-falcon-principles-threads http://dev.mysql.com/doc/falcon/en/se-falcon-principles-threads.html
+se-falcon-principles-compression http://dev.mysql.com/doc/falcon/en/se-falcon-principles-compression.html
+se-falcon-principles-recordslot http://dev.mysql.com/doc/falcon/en/se-falcon-principles-recordslot.html
+se-falcon-limits http://dev.mysql.com/doc/falcon/en/se-falcon-limits.html
+
Modified: branches/telcos/refman-5.1/replication.xml
===================================================================
--- branches/telcos/refman-5.1/replication.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/replication.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 0; 818 bytes
@@ -1848,6 +1848,13 @@
</para>
<para>
+ With statement-based binary logging, <literal>INSERT DELAYED
+ ... VALUES(LAST_INSERT_ID())</literal> inserts a different
+ value on the master and the slave. (Bug #20819) This does not
+ occur for row-based or mixed-format binary logging.
+ </para>
+
+ <para>
A stored procedure that uses
<literal>LAST_INSERT_ID()</literal> does not replicate
properly using statement-based binary logging. This limitation
Modified: branches/telcos/refman-5.1/se-federated.xml
===================================================================
--- branches/telcos/refman-5.1/se-federated.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/se-federated.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 3, Lines Added: 15, Lines Deleted: 6; 1889 bytes
@@ -332,7 +332,8 @@
<listitem>
<para>
- There is no support for transactions.
+ Transactions are supported, but distributed transactions (XA)
+ are not currently supported.
</para>
</listitem>
@@ -351,11 +352,11 @@
<para>
The <literal>FEDERATED</literal> storage engine supports
<literal>SELECT</literal>, <literal>INSERT</literal>,
- <literal>UPDATE</literal>, <literal>DELETE</literal>, and
- indexes. It does not support <literal>ALTER TABLE</literal>,
- or any Data Definition Language statements other than
- <literal>DROP TABLE</literal>. The current implementation does
- not use Prepared statements.
+ <literal>UPDATE</literal>, <literal>DELETE</literal>,
+ <literal>TRUNCATE</literal>, and indexes. It does not support
+ <literal>ALTER TABLE</literal>, or any Data Definition
+ Language statements other than <literal>DROP TABLE</literal>.
+ The current implementation does not use prepared statements.
<remark>
It remains to be seen whether the limited subset of the
@@ -366,6 +367,14 @@
<listitem>
<para>
+ The <literal>INSERT_ID</literal> and
+ <literal>TIMESTAMP</literal> options are not propagated to the
+ data provider.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Any <literal>DROP TABLE</literal> statement issued against a
<literal>FEDERATED</literal> table will only drop the local
table, not the remote table.
Modified: branches/telcos/refman-5.1/se-innodb.xml
===================================================================
--- branches/telcos/refman-5.1/se-innodb.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/se-innodb.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 6; 1130 bytes
@@ -4442,12 +4442,11 @@
<literal>DROP DATABASE</literal>, <literal>DROP
FUNCTION</literal>, <literal>DROP INDEX</literal>,
<literal>DROP PROCEDURE</literal>, <literal>DROP
- TABLE</literal>, <literal>LOAD MASTER DATA</literal>,
- <literal>LOCK TABLES</literal>, <literal>RENAME
- TABLE</literal>, <literal>SET AUTOCOMMIT=1</literal>,
- <literal>START TRANSACTION</literal>,
- <literal>TRUNCATE</literal>, <literal>UNLOCK
- TABLES</literal>.
+ TABLE</literal>, <literal>LOCK TABLES</literal>,
+ <literal>RENAME TABLE</literal>, <literal>SET
+ AUTOCOMMIT=1</literal>, <literal>START
+ TRANSACTION</literal>, <literal>TRUNCATE</literal>,
+ <literal>UNLOCK TABLES</literal>.
</para>
</listitem>
Modified: branches/telcos/refman-5.1/sql-syntax.xml
===================================================================
--- branches/telcos/refman-5.1/sql-syntax.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/sql-syntax.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 14, Lines Added: 143, Lines Deleted: 23; 11494 bytes
@@ -4921,7 +4921,7 @@
<para>
<literal>DELETE QUICK</literal> is not useful when deleted
- values lead to under-filled index blocks spanning a range of
+ values lead to underfilled index blocks spanning a range of
index values for which new inserts occur again. In this case,
use of <literal>QUICK</literal> can lead to wasted space in the
index that remains unreclaimed. Here is an example of such a
@@ -4955,14 +4955,14 @@
<para>
In this scenario, the index blocks associated with the deleted
- index values become under-filled but are not merged with other
+ index values become underfilled but are not merged with other
index blocks due to the use of <literal>QUICK</literal>. They
- remain under-filled when new inserts occur, because new rows do
+ remain underfilled when new inserts occur, because new rows do
not have index values in the deleted range. Furthermore, they
- remain under-filled even if you later use
+ remain underfilled even if you later use
<literal>DELETE</literal> without <literal>QUICK</literal>,
unless some of the deleted index values happen to lie in index
- blocks within or adjacent to the under-filled blocks. To reclaim
+ blocks within or adjacent to the underfilled blocks. To reclaim
unused index space under these circumstances, use
<literal>OPTIMIZE TABLE</literal>.
</para>
@@ -10198,8 +10198,9 @@
</para>
<para>
- The word <literal>IN</literal> is an alias for <literal>=
- ANY</literal>. Thus, these two statements are the same:
+ When used with a subquery, the word <literal>IN</literal> is
+ an alias for <literal>= ANY</literal>. Thus, these two
+ statements are the same:
</para>
<programlisting>
@@ -10208,7 +10209,15 @@
</programlisting>
<para>
- However, <literal>NOT IN</literal> is not an alias for
+ <literal>IN</literal> and <literal>= ANY</literal> are not
+ synonyms when used with an expression list.
+ <literal>IN</literal> can take an expression list, but
+ <literal>= ANY</literal> cannot. See
+ <xref linkend="comparison-operators"/>.
+ </para>
+
+ <para>
+ <literal>NOT IN</literal> is not an alias for
<literal><> ANY</literal>, but for <literal><>
ALL</literal>. See <xref linkend="all-subqueries"/>.
</para>
@@ -10655,8 +10664,8 @@
Subqueries in the <literal>FROM</literal> clause can return a
scalar, column, row, or table. Subqueries in the
<literal>FROM</literal> clause cannot be correlated
- subqueries, unless used within the <literal>ON</literal> clause of a
- <literal>JOIN</literal> operation.
+ subqueries, unless used within the <literal>ON</literal>
+ clause of a <literal>JOIN</literal> operation.
</para>
<para>
@@ -12174,13 +12183,13 @@
is standard SQL syntax and is the recommended way to start an
ad-hoc transaction.
</para>
-
+
<para>
<emphasis role="bold">Important</emphasis>: Many APIs used for
writing MySQL client applications (such as JDBC) provide their
own methods for starting transactions that can (and sometimes
should) be used instead of sending a <literal>START
- TRANSACTION</literal> statement from the client. See
+ TRANSACTION</literal> statement from the client. See
<xref linkend="apis"/>, or the documentation for your API, for
more information.
</para>
@@ -12353,12 +12362,11 @@
<literal>DROP DATABASE</literal>, <literal>DROP
FUNCTION</literal>, <literal>DROP INDEX</literal>,
<literal>DROP PROCEDURE</literal>, <literal>DROP
- TABLE</literal>, <literal>LOAD MASTER DATA</literal>,
- <literal>LOCK TABLES</literal>, <literal>LOAD DATA
- INFILE</literal>, <literal>RENAME TABLE</literal>,
- <literal>SET AUTOCOMMIT=1</literal>, <literal>START
- TRANSACTION</literal>, <literal>TRUNCATE TABLE</literal>,
- <literal>UNLOCK TABLES</literal>.
+ TABLE</literal>, <literal>LOAD DATA INFILE</literal>
+ <literal>LOCK TABLES</literal>, <literal>RENAME
+ TABLE</literal>, <literal>SET AUTOCOMMIT=1</literal>,
+ <literal>START TRANSACTION</literal>, <literal>TRUNCATE
+ TABLE</literal>, <literal>UNLOCK TABLES</literal>.
</para>
</listitem>
@@ -12707,7 +12715,11 @@
while the thread is waiting for the <literal>WRITE</literal>
lock. You should use <literal>LOW_PRIORITY WRITE</literal> locks
only if you are sure that eventually there will be a time when
- no threads have a <literal>READ</literal> lock.
+ no threads have a <literal>READ</literal> lock. (Exception: For
+ <literal>InnoDB</literal> tables in transactional mode
+ (autocommit = 0), a <literal>LOW_PRIORITY WRITE</literal> lock
+ acts like a regular <literal>WRITE</literal> lock and precedes
+ waiting <literal>READ</literal> locks.)
</para>
<para>
@@ -17099,6 +17111,10 @@
</indexterm>
<indexterm>
+ <primary>SHOW FUNCTION CODE</primary>
+ </indexterm>
+
+ <indexterm>
<primary>SHOW FUNCTION STATUS</primary>
</indexterm>
@@ -17131,6 +17147,10 @@
</indexterm>
<indexterm>
+ <primary>SHOW PROCEDURE CODE</primary>
+ </indexterm>
+
+ <indexterm>
<primary>SHOW PROCEDURE STATUS</primary>
</indexterm>
@@ -17209,10 +17229,12 @@
SHOW [STORAGE] ENGINES
SHOW ERRORS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
SHOW [FULL] EVENTS
+SHOW FUNCTION CODE <replaceable>sp_name</replaceable>
SHOW FUNCTION STATUS [LIKE '<replaceable>pattern</replaceable>']
SHOW GRANTS FOR <replaceable>user</replaceable>
SHOW INDEX FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>]
SHOW INNODB STATUS
+SHOW PROCEDURE CODE <replaceable>sp_name</replaceable>
SHOW PROCEDURE STATUS [LIKE '<replaceable>pattern</replaceable>']
SHOW PLUGINS
SHOW PRIVILEGES
@@ -17692,9 +17714,12 @@
<remark role="help-description-begin"/>
<para>
- This statement is a MySQL extension. Similar to <literal>SHOW
- CREATE TABLE</literal>, it returns the exact string that can
- be used to re-create the named routine.
+ These statements are MySQL extensions. Similar to
+ <literal>SHOW CREATE TABLE</literal>, they return the exact
+ string that can be used to re-create the named routine. The
+ statements require that you be the owner of the routine or
+ have <literal>SELECT</literal> access to the
+ <literal>mysql.proc</literal> table.
</para>
<remark role="help-description-end"/>
@@ -19092,6 +19117,101 @@
</section>
+ <section id="show-procedure-code">
+
+ <title><literal>SHOW PROCEDURE CODE</literal> and <literal>SHOW FUNCTION
+ CODE</literal> Syntax</title>
+
+ <indexterm>
+ <primary>SHOW PROCEDURE CODE</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>SHOW FUNCTION CODE</primary>
+ </indexterm>
+
+ <remark role="help-topic" condition="SHOW PROCEDURE CODE"/>
+
+ <remark role="help-keywords">
+ SHOW PROCEDURE FUNCTION CODE
+ </remark>
+
+ <remark role="help-syntax"/>
+
+<programlisting>
+SHOW {PROCEDURE | FUNCTION} CODE <replaceable>sp_name</replaceable>
+</programlisting>
+
+ <remark role="help-description-begin"/>
+
+ <para>
+ These statements are MySQL extensions that are available only
+ for servers that have been built with debugging support. They
+ display a representation of the internal implementation of the
+ named routine. The statements require that you be the owner of
+ the routine or have <literal>SELECT</literal> access to the
+ <literal>mysql.proc</literal> table.
+ </para>
+
+ <para>
+ If the named routine is available, each statement produces a
+ result set. Each row in the result set corresponds to one
+ <quote>instruction</quote> in the routine. The first column is
+ <literal>Pos</literal>, which is an ordinal number beginning
+ with 0. The second column is <literal>Instruction</literal>,
+ which contains an SQL statement (usually changed from the
+ original source), or a directive which has meaning only to the
+ stored-routine handler.
+ </para>
+
+ <remark role="help-description-end"/>
+
+ <remark role="help-example"/>
+
+<programlisting>
+mysql> <userinput>DELIMITER //</userinput>
+mysql> <userinput>CREATE PROCEDURE p1 ()</userinput>
+ -> <userinput>BEGIN</userinput>
+ -> <userinput>DECLARE fanta INT DEFAULT 55;</userinput>
+ -> <userinput>DROP TABLE t2;</userinput>
+ -> <userinput>LOOP</userinput>
+ -> <userinput>INSERT INTO t3 VALUES (fanta);</userinput>
+ -> <userinput>END LOOP;</userinput>
+ -> <userinput>END//</userinput>
+Query OK, 0 rows affected (0.00 sec)
+
+mysql> <userinput>SHOW PROCEDURE CODE p1//</userinput>
++-----+----------------------------------------+
+| Pos | Instruction |
++-----+----------------------------------------+
+| 0 | set fanta@0 55 |
+| 1 | stmt 9 "DROP TABLE t2" |
+| 2 | stmt 5 "INSERT INTO t3 VALUES (fanta)" |
+| 3 | jump 2 |
++-----+----------------------------------------+
+4 rows in set (0.00 sec)
+</programlisting>
+
+ <para>
+ In this example, the non-executable <literal>BEGIN</literal>
+ and <literal>END</literal> statements have disappeared, and
+ for the <literal>DECLARE
+ <replaceable>variable_name</replaceable></literal> statement,
+ only the executable part appears (the part where the default
+ is assigned). For each statement that is taken from source,
+ there is a code word <literal>stmt</literal> followed by a
+ type (9 means <literal>DROP</literal>, 5 means
+ <literal>INSERT</literal>, and so on). The final row contains
+ an instruction <literal>jump 2</literal>, meaning
+ <literal>GOTO instruction #2</literal>.
+ </para>
+
+ <para>
+ These statements were added in MySQL 5.1.3.
+ </para>
+
+ </section>
+
<section id="show-procedure-status">
<title><literal>SHOW PROCEDURE STATUS</literal> and <literal>SHOW FUNCTION
@@ -19120,7 +19240,7 @@
<remark role="help-description-begin"/>
<para>
- This statement is a MySQL extension. It returns
+ These statements are MySQL extensions. They return
characteristics of routines, such as the database, name, type,
creator, and creation and modification dates. If no pattern is
specified, the information for all stored procedures or all
Modified: branches/telcos/refman-5.1/storage-engines.xml
===================================================================
--- branches/telcos/refman-5.1/storage-engines.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/storage-engines.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 6, Lines Added: 8, Lines Deleted: 13; 2785 bytes
@@ -74,10 +74,6 @@
<primary><literal>FEDERATED</literal> storage engine</primary>
</indexterm>
- <indexterm>
- <primary><literal>Falcon</literal> storage engine</primary>
- </indexterm>
-
<para>
MySQL supports several storage engines that act as handlers for
different table types. MySQL storage engines include both those that
@@ -95,10 +91,10 @@
This chapter describes each of the MySQL storage engines except for
<literal>NDB Cluster</literal>, which is covered in
<xref linkend="mysql-cluster"/>. It also contains a description of
- the pluggable storage engine architecture (see
+ the pluggable storage engine architecture (see
<xref linkend="pluggable-storage-overview"/>).
</para>
-
+
<para>
For answers to some commonly asked questions about MySQL storage
engines, see <xref linkend="faqs-storage-engines"/>.
@@ -122,8 +118,8 @@
</para>
<para>
- The MySQL pluggable storage engine architecture in shown in
- <xref linkend="figure-storage-engine-architecture"/>.
+ The MySQL pluggable storage engine architecture is shown in
+ <xref linkend="figure-storage-engine-architecture"/>.
</para>
<figure id="figure-storage-engine-architecture">
@@ -877,8 +873,8 @@
<para>
<emphasis role="bold"><ulink url="http://forge.mysql.com/projects/view.php?id=98">mdbtools</ulink></emphasis>
— A pluggable storage engine that allows read-only
- access to Microsoft Access <filename>.mdb</filename>
- database files.
+ access to Microsoft Access <filename>.mdb</filename> database
+ files.
</para>
</listitem>
@@ -892,7 +888,7 @@
database. solidDB Storage Engine for MySQL is a
multi-threaded storage engine that supports full ACID
compliance with all expected transaction isolation levels,
- row-level locking, and multi-version concurrency control
+ row-level locking, and Multi-Version Concurrency Control
(MVCC) with non-blocking reads and writes.
</para>
</listitem>
@@ -902,8 +898,7 @@
<para>
For more information on developing a customer storage engine
that can be used with the Pluggable Storage Engine Architecture,
- see <xref linkend="custom-engine"/>, of the MySQL Internals
- manual.
+ see <xref linkend="custom-engine"/>, in the MySQL Internals manual.
</para>
</section>
Modified: branches/telcos/refman-5.1/stored-procedures.xml
===================================================================
--- branches/telcos/refman-5.1/stored-procedures.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/stored-procedures.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 6; 1235 bytes
@@ -425,6 +425,13 @@
<xref linkend="routine-restrictions"/>.
</para>
+ <para>
+ MySQL stores the <literal>sql_mode</literal> system variable
+ setting that is in effect at the time a routine is created, and
+ always executes the routine with this setting in force,
+ <emphasis>regardless of the current server SQL mode</emphasis>.
+ </para>
+
<remark role="help-description-end"/>
<para>
@@ -571,12 +578,6 @@
</itemizedlist>
<para>
- MySQL stores the <literal>sql_mode</literal> system variable
- setting that is in effect at the time a routine is created, and
- always executes the routine with this setting in force.
- </para>
-
- <para>
When the routine is invoked, an implicit <literal>USE
<replaceable>db_name</replaceable></literal> is performed (and
undone when the routine terminates). <literal>USE</literal>
Modified: branches/telcos/refman-5.1/triggers.xml
===================================================================
--- branches/telcos/refman-5.1/triggers.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/triggers.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 0; 789 bytes
@@ -198,6 +198,13 @@
</para>
<para>
+ MySQL stores the <literal>sql_mode</literal> system variable
+ setting that is in effect at the time a trigger is created, and
+ always executes the trigger with this setting in force,
+ <emphasis>regardless of the current server SQL mode</emphasis>.
+ </para>
+
+ <para>
<emphasis role="bold">Note</emphasis>: Currently, triggers are not
activated by cascaded foreign key actions. This limitation will be
lifted as soon as possible.
Modified: branches/telcos/refman-5.1/views.xml
===================================================================
--- branches/telcos/refman-5.1/views.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-5.1/views.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 454 bytes
@@ -811,7 +811,8 @@
<listitem>
<para>
- Join
+ Certain joins (see additional join discussion later in this
+ section)
</para>
</listitem>
Modified: branches/telcos/refman-common/Makefile
===================================================================
--- branches/telcos/refman-common/Makefile 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/refman-common/Makefile 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 56, Lines Deleted: 0; 3597 bytes
@@ -28,12 +28,68 @@
include $(MAKE_DIR)/vars-shell
include $(MAKE_DIR)/vars-docbook
+# We also build the connector sections as separate docs, so list dependencies
+# for them as well.
+
+depend:: connector-j.depend
+
+CONNECTOR_J_SRCS_EXTRA = ../common/fixedchars.ent urls.ent
+
+CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml
+
+connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
+
+depend:: connector-mxj.depend
+
+CONNECTOR_MXJ_SRCS_EXTRA = ../common/fixedchars.ent urls.ent
+
+CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml images/cmxj-overview.png
+
+connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
+
+depend:: connector-net.depend
+
+CONNECTOR_NET_SRCS_EXTRA = ../common/fixedchars.ent urls.ent
+
+CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png
+
+connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
+
+depend:: connector-odbc.depend
+
+CONNECTOR_ODBC_SRCS_EXTRA = ../common/fixedchars.ent urls.ent
+
+CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-crystal-1.png images/myodbc-crystal-2.png images/myodbc-crystal-3.png images/myodbc-crystal-4.png images/myodbc-crystal-5.png images/myodbc-crystal-6.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step!
3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png
+
+connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
+
# Import default target rule (causes help message to print)
include $(MAKE_DIR)/default-target
# Import standard target rules
+include $(MAKE_DIR)/xml-dynxml
include $(MAKE_DIR)/xml-valid
include $(MAKE_DIR)/xml-format
include $(MAKE_DIR)/xml-useless
+include $(MAKE_DIR)/xml-prep
+include $(MAKE_DIR)/xml-html
+include $(MAKE_DIR)/xml-html-dir
+include $(MAKE_DIR)/xml-html-section
+include $(MAKE_DIR)/xml-html-chapter
+include $(MAKE_DIR)/xml-html-web
+include $(MAKE_DIR)/xml-eclipse
+include $(MAKE_DIR)/xml-chm
+include $(MAKE_DIR)/xml-xhtml-dir
+include $(MAKE_DIR)/xml-pdf
+include $(MAKE_DIR)/xml-toc
+include $(MAKE_DIR)/xml-txt
+include $(MAKE_DIR)/xml-info
+include $(MAKE_DIR)/xml-man
+include $(MAKE_DIR)/xml-help
+include $(MAKE_DIR)/xml-remark
+include $(MAKE_DIR)/xml-titles
+include $(MAKE_DIR)/fragment-files
+include $(MAKE_DIR)/xml-depend
+include $(MAKE_DIR)/xml-listing
Added: branches/telcos/refman-common/images/cmxj-overview.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 339 bytes
Added: branches/telcos/refman-common/images/cnet-win-install-step1.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 357 bytes
Added: branches/telcos/refman-common/images/cnet-win-install-step2.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 357 bytes
Added: branches/telcos/refman-common/images/cnet-win-install-step3.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 357 bytes
Added: branches/telcos/refman-common/images/cnet-win-install-step4.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 357 bytes
Added: branches/telcos/refman-common/images/cnet-win-install-step5.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 357 bytes
Added: branches/telcos/refman-common/images/cnet-win-install-step6.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 357 bytes
Added: branches/telcos/refman-common/images/myaccess-odbc.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 339 bytes
Added: branches/telcos/refman-common/images/myaccess.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 329 bytes
Added: branches/telcos/refman-common/images/myarchitecture.graffle
===================================================================
--- branches/telcos/refman-common/images/myarchitecture.graffle (rev 0)
+++ branches/telcos/refman-common/images/myarchitecture.graffle 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 670, Lines Deleted: 0; 23416 bytes
@@ -0,0 +1,670 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CanvasColor</key>
+ <dict>
+ <key>w</key>
+ <string>1</string>
+ </dict>
+ <key>ColumnAlign</key>
+ <integer>1</integer>
+ <key>ColumnSpacing</key>
+ <real>36</real>
+ <key>GraphDocumentVersion</key>
+ <integer>4</integer>
+ <key>GraphicsList</key>
+ <array>
+ <dict>
+ <key>Class</key>
+ <string>LineGraphic</string>
+ <key>Head</key>
+ <dict>
+ <key>ID</key>
+ <integer>4</integer>
+ <key>Info</key>
+ <integer>3</integer>
+ </dict>
+ <key>ID</key>
+ <integer>11</integer>
+ <key>OrthogonalBarAutomatic</key>
+ <true/>
+ <key>OrthogonalBarPosition</key>
+ <real>-1</real>
+ <key>Points</key>
+ <array>
+ <string>{206.655, 145}</string>
+ <string>{206.605, 246}</string>
+ </array>
+ <key>Style</key>
+ <dict>
+ <key>stroke</key>
+ <dict>
+ <key>HeadArrow</key>
+ <string>FilledArrow</string>
+ <key>LineType</key>
+ <integer>2</integer>
+ <key>TailArrow</key>
+ <string>FilledArrow</string>
+ </dict>
+ </dict>
+ <key>Tail</key>
+ <dict>
+ <key>ID</key>
+ <integer>2</integer>
+ <key>Info</key>
+ <integer>6</integer>
+ </dict>
+ </dict>
+ <dict>
+ <key>Class</key>
+ <string>LineGraphic</string>
+ <key>Head</key>
+ <dict>
+ <key>ID</key>
+ <integer>5</integer>
+ <key>Info</key>
+ <integer>2</integer>
+ </dict>
+ <key>ID</key>
+ <integer>10</integer>
+ <key>OrthogonalBarAutomatic</key>
+ <true/>
+ <key>OrthogonalBarPosition</key>
+ <real>-1</real>
+ <key>Points</key>
+ <array>
+ <string>{288, 291}</string>
+ <string>{288, 319}</string>
+ </array>
+ <key>Style</key>
+ <dict>
+ <key>stroke</key>
+ <dict>
+ <key>HeadArrow</key>
+ <string>FilledArrow</string>
+ <key>LineType</key>
+ <integer>2</integer>
+ <key>TailArrow</key>
+ <string>FilledArrow</string>
+ </dict>
+ </dict>
+ <key>Tail</key>
+ <dict>
+ <key>ID</key>
+ <integer>4</integer>
+ <key>Info</key>
+ <integer>5</integer>
+ </dict>
+ </dict>
+ <dict>
+ <key>Class</key>
+ <string>LineGraphic</string>
+ <key>Head</key>
+ <dict>
+ <key>ID</key>
+ <integer>4</integer>
+ <key>Info</key>
+ <integer>6</integer>
+ </dict>
+ <key>ID</key>
+ <integer>9</integer>
+ <key>OrthogonalBarAutomatic</key>
+ <true/>
+ <key>OrthogonalBarPosition</key>
+ <real>-1</real>
+ <key>Points</key>
+ <array>
+ <string>{287.737, 218}</string>
+ <string>{288, 246}</string>
+ </array>
+ <key>Style</key>
+ <dict>
+ <key>stroke</key>
+ <dict>
+ <key>HeadArrow</key>
+ <string>FilledArrow</string>
+ <key>LineType</key>
+ <integer>2</integer>
+ <key>TailArrow</key>
+ <string>FilledArrow</string>
+ </dict>
+ </dict>
+ <key>Tail</key>
+ <dict>
+ <key>ID</key>
+ <integer>3</integer>
+ <key>Info</key>
+ <integer>1</integer>
+ </dict>
+ </dict>
+ <dict>
+ <key>Class</key>
+ <string>LineGraphic</string>
+ <key>Head</key>
+ <dict>
+ <key>ID</key>
+ <integer>3</integer>
+ <key>Info</key>
+ <integer>2</integer>
+ </dict>
+ <key>ID</key>
+ <integer>8</integer>
+ <key>OrthogonalBarAutomatic</key>
+ <true/>
+ <key>OrthogonalBarPosition</key>
+ <real>-1</real>
+ <key>Points</key>
+ <array>
+ <string>{287.357, 145}</string>
+ <string>{287.5, 173}</string>
+ </array>
+ <key>Style</key>
+ <dict>
+ <key>stroke</key>
+ <dict>
+ <key>HeadArrow</key>
+ <string>FilledArrow</string>
+ <key>LineType</key>
+ <integer>2</integer>
+ <key>TailArrow</key>
+ <string>FilledArrow</string>
+ </dict>
+ </dict>
+ <key>Tail</key>
+ <dict>
+ <key>ID</key>
+ <integer>2</integer>
+ <key>Info</key>
+ <integer>5</integer>
+ </dict>
+ </dict>
+ <dict>
+ <key>Class</key>
+ <string>LineGraphic</string>
+ <key>Head</key>
+ <dict>
+ <key>ID</key>
+ <integer>4</integer>
+ <key>Info</key>
+ <integer>2</integer>
+ </dict>
+ <key>ID</key>
+ <integer>7</integer>
+ <key>Labels</key>
+ <array>
+ <dict>
+ <key>Label</key>
+ <dict>
+ <key>Align</key>
+ <integer>0</integer>
+ <key>Text</key>
+ <string>{\rtf1\mac\ansicpg10000\cocoartf102
+{\fonttbl\f0\fnil\fcharset77 HelveticaNeue;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\fs28 \cf0 Direct Linking}</string>
+ </dict>
+ <key>LabelVisible</key>
+ <string>YES</string>
+ <key>Offset</key>
+ <real>11.875</real>
+ <key>Orientation</key>
+ <integer>2</integer>
+ <key>Position</key>
+ <real>0.5078125</real>
+ </dict>
+ </array>
+ <key>OrthogonalBarAutomatic</key>
+ <true/>
+ <key>OrthogonalBarPosition</key>
+ <real>-1</real>
+ <key>Points</key>
+ <array>
+ <string>{390.864, 72}</string>
+ <string>{390.916, 246}</string>
+ </array>
+ <key>Style</key>
+ <dict>
+ <key>stroke</key>
+ <dict>
+ <key>HeadArrow</key>
+ <string>FilledArrow</string>
+ <key>LineType</key>
+ <integer>2</integer>
+ <key>TailArrow</key>
+ <string>FilledArrow</string>
+ </dict>
+ </dict>
+ <key>Tail</key>
+ <dict>
+ <key>ID</key>
+ <integer>1</integer>
+ <key>Info</key>
+ <integer>5</integer>
+ </dict>
+ </dict>
+ <dict>
+ <key>Class</key>
+ <string>LineGraphic</string>
+ <key>Head</key>
+ <dict>
+ <key>ID</key>
+ <integer>2</integer>
+ </dict>
+ <key>ID</key>
+ <integer>6</integer>
+ <key>OrthogonalBarAutomatic</key>
+ <true/>
+ <key>OrthogonalBarPosition</key>
+ <real>-1</real>
+ <key>Points</key>
+ <array>
+ <string>{215, 72}</string>
+ <string>{215.02, 100}</string>
+ </array>
+ <key>Style</key>
+ <dict>
+ <key>stroke</key>
+ <dict>
+ <key>HeadArrow</key>
+ <string>FilledArrow</string>
+ <key>LineType</key>
+ <integer>2</integer>
+ <key>TailArrow</key>
+ <string>FilledArrow</string>
+ </dict>
+ </dict>
+ <key>Tail</key>
+ <dict>
+ <key>ID</key>
+ <integer>1</integer>
+ <key>Info</key>
+ <integer>6</integer>
+ </dict>
+ </dict>
+ <dict>
+ <key>Bounds</key>
+ <string>{{230, 319}, {116, 67}}</string>
+ <key>Class</key>
+ <string>ShapedGraphic</string>
+ <key>ID</key>
+ <integer>5</integer>
+ <key>Magnets</key>
+ <array>
+ <string>{0, 1}</string>
+ <string>{0, -1}</string>
+ <string>{1, 0}</string>
+ <string>{-1, 0}</string>
+ </array>
+ <key>Shape</key>
+ <string>Cylinder</string>
+ <key>Text</key>
+ <dict>
+ <key>Text</key>
+ <string>{\rtf1\mac\ansicpg10000\cocoartf102
+{\fonttbl\f0\fnil\fcharset77 HelveticaNeue;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+
+\f0\fs28 \cf0 MySQL Server}</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Bounds</key>
+ <string>{{142, 246}, {292, 45}}</string>
+ <key>Class</key>
+ <string>ShapedGraphic</string>
+ <key>ID</key>
+ <integer>4</integer>
+ <key>Magnets</key>
+ <array>
+ <string>{1, 1}</string>
+ <string>{0.352453, -0.5}</string>
+ <string>{-0.278749, -0.5}</string>
+ <string>{-1, 1}</string>
+ <string>{0, 1}</string>
+ <string>{0, -1}</string>
+ <string>{1, 0}</string>
+ <string>{-1, 0}</string>
+ </array>
+ <key>Shape</key>
+ <string>Rectangle</string>
+ <key>Text</key>
+ <dict>
+ <key>Text</key>
+ <string>{\rtf1\mac\ansicpg10000\cocoartf102
+{\fonttbl\f0\fnil\fcharset77 HelveticaNeue;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+
+\f0\fs28 \cf0 Connector/ODBC}</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Bounds</key>
+ <string>{{242, 173}, {91, 45}}</string>
+ <key>Class</key>
+ <string>ShapedGraphic</string>
+ <key>ID</key>
+ <integer>3</integer>
+ <key>Magnets</key>
+ <array>
+ <string>{0.00260663, 0.5}</string>
+ <string>{0, -1}</string>
+ <string>{1, 0}</string>
+ <string>{-1, 0}</string>
+ </array>
+ <key>Shape</key>
+ <string>Rectangle</string>
+ <key>Text</key>
+ <dict>
+ <key>Text</key>
+ <string>{\rtf1\mac\ansicpg10000\cocoartf102
+{\fonttbl\f0\fnil\fcharset77 HelveticaNeue;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+
+\f0\fs28 \cf0 ODBC.INI}</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Bounds</key>
+ <string>{{112, 100}, {233, 45}}</string>
+ <key>Class</key>
+ <string>ShapedGraphic</string>
+ <key>ID</key>
+ <integer>2</integer>
+ <key>Magnets</key>
+ <array>
+ <string>{1, 0.5}</string>
+ <string>{1, -0.5}</string>
+ <string>{-1, 0.5}</string>
+ <string>{-1, -0.5}</string>
+ <string>{0.252606, 0.5}</string>
+ <string>{-0.0962862, 0.513495}</string>
+ <string>{0.5, -1}</string>
+ <string>{-0.0578536, -0.5}</string>
+ </array>
+ <key>Shape</key>
+ <string>Rectangle</string>
+ <key>Text</key>
+ <dict>
+ <key>Text</key>
+ <string>{\rtf1\mac\ansicpg10000\cocoartf102
+{\fonttbl\f0\fnil\fcharset77 HelveticaNeue;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+
+\f0\fs28 \cf0 Driver Manager}</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Bounds</key>
+ <string>{{142, 27}, {292, 45}}</string>
+ <key>Class</key>
+ <string>ShapedGraphic</string>
+ <key>ID</key>
+ <integer>1</integer>
+ <key>Magnets</key>
+ <array>
+ <string>{1, 0.5}</string>
+ <string>{1, -0.5}</string>
+ <string>{-1, 0.5}</string>
+ <string>{-1, -0.5}</string>
+ <string>{0.352273, 0.5}</string>
+ <string>{-0.5, 1}</string>
+ <string>{0.5, -1}</string>
+ <string>{-0.5, -1}</string>
+ </array>
+ <key>Shape</key>
+ <string>Rectangle</string>
+ <key>Text</key>
+ <dict>
+ <key>Text</key>
+ <string>{\rtf1\mac\ansicpg10000\cocoartf102
+{\fonttbl\f0\fnil\fcharset77 HelveticaNeue;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+
+\f0\fs28 \cf0 Application}</string>
+ </dict>
+ </dict>
+ </array>
+ <key>GridInfo</key>
+ <dict/>
+ <key>GuidesLocked</key>
+ <string>NO</string>
+ <key>GuidesVisible</key>
+ <string>YES</string>
+ <key>HPages</key>
+ <integer>1</integer>
+ <key>ImageCounter</key>
+ <integer>1</integer>
+ <key>IsPalette</key>
+ <string>NO</string>
+ <key>Layers</key>
+ <array>
+ <dict>
+ <key>Lock</key>
+ <string>NO</string>
+ <key>Name</key>
+ <string>Layer 1</string>
+ <key>Print</key>
+ <string>YES</string>
+ <key>View</key>
+ <string>YES</string>
+ </dict>
+ </array>
+ <key>LayoutInfo</key>
+ <dict/>
+ <key>LinksVisible</key>
+ <string>NO</string>
+ <key>MagnetsVisible</key>
+ <string>NO</string>
+ <key>Orientation</key>
+ <integer>2</integer>
+ <key>PageBreaks</key>
+ <string>YES</string>
+ <key>PageSetup</key>
+ <data>
+ BAt0eXBlZHN0cmVhbYED6IQBQISEhAtOU1ByaW50SW5mbwGEhAhOU09iamVjdACFkoSE
+ hBNOU011dGFibGVEaWN0aW9uYXJ5AISEDE5TRGljdGlvbmFyeQCUhAFpFJKEhIQITlNT
+ dHJpbmcBlIQBKxBOU0pvYkRpc3Bvc2l0aW9uhpKEmZkPTlNQcmludFNwb29sSm9ihpKE
+ mZkLTlNQYXBlclNpemWGkoSEhAdOU1ZhbHVlAJSEASqEhAx7X05TU2l6ZT1mZn2cgQJk
+ gQMYhpKEmZkZTlNQcmludFJldmVyc2VPcmllbnRhdGlvboaShISECE5TTnVtYmVyAJ2b
+ hJeXAIaShJmZFE5TVmVydGljYWxQYWdpbmF0aW9uhpKEoZuilwCGkoSZmRROU1ZlcnRp
+ Y2FsbHlDZW50ZXJlZIaShKGbopcBhpKEmZkOTlNQTVBhZ2VGb3JtYXSGkoSEhAZOU0Rh
+ dGEAlJeBHa2EB1s3NTk3Y108P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYt
+ OCI/Pgo8IURPQ1RZUEUgcGxpc3QgUFVCTElDICItLy9BcHBsZSBDb21wdXRlci8vRFRE
+ IFBMSVNUIDEuMC8vRU4iICJodHRwOi8vd3d3LmFwcGxlLmNvbS9EVERzL1Byb3BlcnR5
+ TGlzdC0xLjAuZHRkIj4KPHBsaXN0IHZlcnNpb249IjEuMCI+CjxkaWN0PgoJPGtleT5j
+ b20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTUhvcml6b250YWxSZXM8L2tleT4KCTxk
+ aWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5jcmVhdG9yPC9rZXk+CgkJ
+ PHN0cmluZz5jb20uYXBwbGUucHJpbnRpbmdtYW5hZ2VyPC9zdHJpbmc+CgkJPGtleT5j
+ b20uYXBwbGUucHJpbnQudGlja2V0Lml0ZW1BcnJheTwva2V5PgoJCTxhcnJheT4KCQkJ
+ PGRpY3Q+CgkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0LlBNSG9yaXpv
+ bnRhbFJlczwva2V5PgoJCQkJPHJlYWw+NzI8L3JlYWw+CgkJCQk8a2V5PmNvbS5hcHBs
+ ZS5wcmludC50aWNrZXQuY2xpZW50PC9rZXk+CgkJCQk8c3RyaW5nPmNvbS5hcHBsZS5w
+ cmludGluZ21hbmFnZXI8L3N0cmluZz4KCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRp
+ Y2tldC5tb2REYXRlPC9rZXk+CgkJCQk8ZGF0ZT4yMDAzLTAxLTI0VDE2OjI4OjU0Wjwv
+ ZGF0ZT4KCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5zdGF0ZUZsYWc8L2tl
+ eT4KCQkJCTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCTwvZGljdD4KCQk8L2FycmF5PgoJ
+ PC9kaWN0PgoJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTU9yaWVudGF0
+ aW9uPC9rZXk+Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3Jl
+ YXRvcjwva2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50aW5nbWFuYWdlcjwvc3Ry
+ aW5nPgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4K
+ CQk8YXJyYXk+CgkJCTxkaWN0PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZv
+ cm1hdC5QTU9yaWVudGF0aW9uPC9rZXk+CgkJCQk8aW50ZWdlcj4xPC9pbnRlZ2VyPgoJ
+ CQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LmNsaWVudDwva2V5PgoJCQkJPHN0
+ cmluZz5jb20uYXBwbGUucHJpbnRpbmdtYW5hZ2VyPC9zdHJpbmc+CgkJCQk8a2V5PmNv
+ bS5hcHBsZS5wcmludC50aWNrZXQubW9kRGF0ZTwva2V5PgoJCQkJPGRhdGU+MjAwMy0w
+ MS0yNFQxNjoyODo1NFo8L2RhdGU+CgkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNr
+ ZXQuc3RhdGVGbGFnPC9rZXk+CgkJCQk8aW50ZWdlcj4wPC9pbnRlZ2VyPgoJCQk8L2Rp
+ Y3Q+CgkJPC9hcnJheT4KCTwvZGljdD4KCTxrZXk+Y29tLmFwcGxlLnByaW50LlBhZ2VG
+ b3JtYXQuUE1TY2FsaW5nPC9rZXk+Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBsZS5wcmlu
+ dC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50aW5n
+ bWFuYWdlcjwvc3RyaW5nPgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5pdGVt
+ QXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJCTxkaWN0PgoJCQkJPGtleT5jb20uYXBwbGUu
+ cHJpbnQuUGFnZUZvcm1hdC5QTVNjYWxpbmc8L2tleT4KCQkJCTxyZWFsPjE8L3JlYWw+
+ CgkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY2xpZW50PC9rZXk+CgkJCQk8
+ c3RyaW5nPmNvbS5hcHBsZS5wcmludGluZ21hbmFnZXI8L3N0cmluZz4KCQkJCTxrZXk+
+ Y29tLmFwcGxlLnByaW50LnRpY2tldC5tb2REYXRlPC9rZXk+CgkJCQk8ZGF0ZT4yMDAz
+ LTAxLTI0VDE2OjI4OjU0WjwvZGF0ZT4KCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRp
+ Y2tldC5zdGF0ZUZsYWc8L2tleT4KCQkJCTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCTwv
+ ZGljdD4KCQk8L2FycmF5PgoJPC9kaWN0PgoJPGtleT5jb20uYXBwbGUucHJpbnQuUGFn
+ ZUZvcm1hdC5QTVZlcnRpY2FsUmVzPC9rZXk+Cgk8ZGljdD4KCQk8a2V5PmNvbS5hcHBs
+ ZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxlLnBy
+ aW50aW5nbWFuYWdlcjwvc3RyaW5nPgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tl
+ dC5pdGVtQXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJCTxkaWN0PgoJCQkJPGtleT5jb20u
+ YXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTVZlcnRpY2FsUmVzPC9rZXk+CgkJCQk8cmVh
+ bD43MjwvcmVhbD4KCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5jbGllbnQ8
+ L2tleT4KCQkJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50aW5nbWFuYWdlcjwvc3RyaW5n
+ PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lm1vZERhdGU8L2tleT4KCQkJ
+ CTxkYXRlPjIwMDMtMDEtMjRUMTY6Mjg6NTRaPC9kYXRlPgoJCQkJPGtleT5jb20uYXBw
+ bGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJPGludGVnZXI+MDwvaW50
+ ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJyYXk+Cgk8L2RpY3Q+Cgk8a2V5PmNvbS5hcHBs
+ ZS5wcmludC5QYWdlRm9ybWF0LlBNVmVydGljYWxTY2FsaW5nPC9rZXk+Cgk8ZGljdD4K
+ CQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCTxzdHJp
+ bmc+Y29tLmFwcGxlLnByaW50aW5nbWFuYWdlcjwvc3RyaW5nPgoJCTxrZXk+Y29tLmFw
+ cGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQk8YXJyYXk+CgkJCTxkaWN0
+ PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTVZlcnRpY2FsU2Nh
+ bGluZzwva2V5PgoJCQkJPHJlYWw+MTwvcmVhbD4KCQkJCTxrZXk+Y29tLmFwcGxlLnBy
+ aW50LnRpY2tldC5jbGllbnQ8L2tleT4KCQkJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50
+ aW5nbWFuYWdlcjwvc3RyaW5nPgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0
+ Lm1vZERhdGU8L2tleT4KCQkJCTxkYXRlPjIwMDMtMDEtMjRUMTY6Mjg6NTRaPC9kYXRl
+ PgoJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJ
+ CQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJPC9kaWN0PgoJCTwvYXJyYXk+Cgk8L2Rp
+ Y3Q+Cgk8a2V5PmNvbS5hcHBsZS5wcmludC5zdWJUaWNrZXQucGFwZXJfaW5mb190aWNr
+ ZXQ8L2tleT4KCTxkaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LlBhZ2VGb3JtYXQu
+ UE1BZGp1c3RlZFBhZ2VSZWN0PC9rZXk+CgkJPGRpY3Q+CgkJCTxrZXk+Y29tLmFwcGxl
+ LnByaW50LnRpY2tldC5jcmVhdG9yPC9rZXk+CgkJCTxzdHJpbmc+Y29tLmFwcGxlLnBy
+ aW50aW5nbWFuYWdlcjwvc3RyaW5nPgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNr
+ ZXQuaXRlbUFycmF5PC9rZXk+CgkJCTxhcnJheT4KCQkJCTxkaWN0PgoJCQkJCTxrZXk+
+ Y29tLmFwcGxlLnByaW50LlBhZ2VGb3JtYXQuUE1BZGp1c3RlZFBhZ2VSZWN0PC9rZXk+
+ CgkJCQkJPGFycmF5PgoJCQkJCQk8cmVhbD4wLjA8L3JlYWw+CgkJCQkJCTxyZWFsPjAu
+ MDwvcmVhbD4KCQkJCQkJPHJlYWw+NzM0PC9yZWFsPgoJCQkJCQk8cmVhbD41NzY8L3Jl
+ YWw+CgkJCQkJPC9hcnJheT4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQu
+ Y2xpZW50PC9rZXk+CgkJCQkJPHN0cmluZz5jb20uYXBwbGUucHJpbnRpbmdtYW5hZ2Vy
+ PC9zdHJpbmc+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lm1vZERhdGU8
+ L2tleT4KCQkJCQk8ZGF0ZT4yMDA0LTEwLTE1VDE0OjIxOjA1WjwvZGF0ZT4KCQkJCQk8
+ a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVGbGFnPC9rZXk+CgkJCQkJPGlu
+ dGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJPC9hcnJheT4KCQk8L2RpY3Q+
+ CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFnZUZvcm1hdC5QTUFkanVzdGVkUGFwZXJS
+ ZWN0PC9rZXk+CgkJPGRpY3Q+CgkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5j
+ cmVhdG9yPC9rZXk+CgkJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50aW5nbWFuYWdlcjwv
+ c3RyaW5nPgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuaXRlbUFycmF5PC9r
+ ZXk+CgkJCTxhcnJheT4KCQkJCTxkaWN0PgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50
+ LlBhZ2VGb3JtYXQuUE1BZGp1c3RlZFBhcGVyUmVjdDwva2V5PgoJCQkJCTxhcnJheT4K
+ CQkJCQkJPHJlYWw+LTE4PC9yZWFsPgoJCQkJCQk8cmVhbD4tMTg8L3JlYWw+CgkJCQkJ
+ CTxyZWFsPjc3NDwvcmVhbD4KCQkJCQkJPHJlYWw+NTk0PC9yZWFsPgoJCQkJCTwvYXJy
+ YXk+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LmNsaWVudDwva2V5PgoJ
+ CQkJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50aW5nbWFuYWdlcjwvc3RyaW5nPgoJCQkJ
+ CTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5tb2REYXRlPC9rZXk+CgkJCQkJPGRh
+ dGU+MjAwNC0xMC0xNVQxNDoyMTowNVo8L2RhdGU+CgkJCQkJPGtleT5jb20uYXBwbGUu
+ cHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJCTxpbnRlZ2VyPjA8L2ludGVn
+ ZXI+CgkJCQk8L2RpY3Q+CgkJCTwvYXJyYXk+CgkJPC9kaWN0PgoJCTxrZXk+Y29tLmFw
+ cGxlLnByaW50LlBhcGVySW5mby5QTVBhcGVyTmFtZTwva2V5PgoJCTxkaWN0PgoJCQk8
+ a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5n
+ PmNvbS5hcHBsZS5wcmludC5wbS5Qb3N0U2NyaXB0PC9zdHJpbmc+CgkJCTxrZXk+Y29t
+ LmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQkJPGFycmF5PgoJCQkJ
+ PGRpY3Q+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZvLlBNUGFwZXJO
+ YW1lPC9rZXk+CgkJCQkJPHN0cmluZz5uYS1sZXR0ZXI8L3N0cmluZz4KCQkJCQk8a2V5
+ PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY2xpZW50PC9rZXk+CgkJCQkJPHN0cmluZz5j
+ b20uYXBwbGUucHJpbnQucG0uUG9zdFNjcmlwdDwvc3RyaW5nPgoJCQkJCTxrZXk+Y29t
+ LmFwcGxlLnByaW50LnRpY2tldC5tb2REYXRlPC9rZXk+CgkJCQkJPGRhdGU+MjAwMC0w
+ Ny0yOFQyMjo1NzowNFo8L2RhdGU+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlj
+ a2V0LnN0YXRlRmxhZzwva2V5PgoJCQkJCTxpbnRlZ2VyPjE8L2ludGVnZXI+CgkJCQk8
+ L2RpY3Q+CgkJCTwvYXJyYXk+CgkJPC9kaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50
+ LlBhcGVySW5mby5QTVVuYWRqdXN0ZWRQYWdlUmVjdDwva2V5PgoJCTxkaWN0PgoJCQk8
+ a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5n
+ PmNvbS5hcHBsZS5wcmludC5wbS5Qb3N0U2NyaXB0PC9zdHJpbmc+CgkJCTxrZXk+Y29t
+ LmFwcGxlLnByaW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQkJPGFycmF5PgoJCQkJ
+ PGRpY3Q+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZvLlBNVW5hZGp1
+ c3RlZFBhZ2VSZWN0PC9rZXk+CgkJCQkJPGFycmF5PgoJCQkJCQk8cmVhbD4wLjA8L3Jl
+ YWw+CgkJCQkJCTxyZWFsPjAuMDwvcmVhbD4KCQkJCQkJPHJlYWw+NzM0PC9yZWFsPgoJ
+ CQkJCQk8cmVhbD41NzY8L3JlYWw+CgkJCQkJPC9hcnJheT4KCQkJCQk8a2V5PmNvbS5h
+ cHBsZS5wcmludC50aWNrZXQuY2xpZW50PC9rZXk+CgkJCQkJPHN0cmluZz5jb20uYXBw
+ bGUucHJpbnRpbmdtYW5hZ2VyPC9zdHJpbmc+CgkJCQkJPGtleT5jb20uYXBwbGUucHJp
+ bnQudGlja2V0Lm1vZERhdGU8L2tleT4KCQkJCQk8ZGF0ZT4yMDAzLTAxLTI0VDE2OjI4
+ OjU0WjwvZGF0ZT4KCQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVG
+ bGFnPC9rZXk+CgkJCQkJPGludGVnZXI+MDwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJ
+ PC9hcnJheT4KCQk8L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZv
+ LlBNVW5hZGp1c3RlZFBhcGVyUmVjdDwva2V5PgoJCTxkaWN0PgoJCQk8a2V5PmNvbS5h
+ cHBsZS5wcmludC50aWNrZXQuY3JlYXRvcjwva2V5PgoJCQk8c3RyaW5nPmNvbS5hcHBs
+ ZS5wcmludC5wbS5Qb3N0U2NyaXB0PC9zdHJpbmc+CgkJCTxrZXk+Y29tLmFwcGxlLnBy
+ aW50LnRpY2tldC5pdGVtQXJyYXk8L2tleT4KCQkJPGFycmF5PgoJCQkJPGRpY3Q+CgkJ
+ CQkJPGtleT5jb20uYXBwbGUucHJpbnQuUGFwZXJJbmZvLlBNVW5hZGp1c3RlZFBhcGVy
+ UmVjdDwva2V5PgoJCQkJCTxhcnJheT4KCQkJCQkJPHJlYWw+LTE4PC9yZWFsPgoJCQkJ
+ CQk8cmVhbD4tMTg8L3JlYWw+CgkJCQkJCTxyZWFsPjc3NDwvcmVhbD4KCQkJCQkJPHJl
+ YWw+NTk0PC9yZWFsPgoJCQkJCTwvYXJyYXk+CgkJCQkJPGtleT5jb20uYXBwbGUucHJp
+ bnQudGlja2V0LmNsaWVudDwva2V5PgoJCQkJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50
+ aW5nbWFuYWdlcjwvc3RyaW5nPgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tl
+ dC5tb2REYXRlPC9rZXk+CgkJCQkJPGRhdGU+MjAwMy0wMS0yNFQxNjoyODo1NFo8L2Rh
+ dGU+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LnN0YXRlRmxhZzwva2V5
+ PgoJCQkJCTxpbnRlZ2VyPjA8L2ludGVnZXI+CgkJCQk8L2RpY3Q+CgkJCTwvYXJyYXk+
+ CgkJPC9kaWN0PgoJCTxrZXk+Y29tLmFwcGxlLnByaW50LlBhcGVySW5mby5wcGQuUE1Q
+ YXBlck5hbWU8L2tleT4KCQk8ZGljdD4KCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlj
+ a2V0LmNyZWF0b3I8L2tleT4KCQkJPHN0cmluZz5jb20uYXBwbGUucHJpbnQucG0uUG9z
+ dFNjcmlwdDwvc3RyaW5nPgoJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuaXRl
+ bUFycmF5PC9rZXk+CgkJCTxhcnJheT4KCQkJCTxkaWN0PgoJCQkJCTxrZXk+Y29tLmFw
+ cGxlLnByaW50LlBhcGVySW5mby5wcGQuUE1QYXBlck5hbWU8L2tleT4KCQkJCQk8c3Ry
+ aW5nPkxldHRlcjwvc3RyaW5nPgoJCQkJCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tl
+ dC5jbGllbnQ8L2tleT4KCQkJCQk8c3RyaW5nPmNvbS5hcHBsZS5wcmludC5wbS5Qb3N0
+ U2NyaXB0PC9zdHJpbmc+CgkJCQkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0Lm1v
+ ZERhdGU8L2tleT4KCQkJCQk8ZGF0ZT4yMDAwLTA3LTI4VDIyOjU3OjA0WjwvZGF0ZT4K
+ CQkJCQk8a2V5PmNvbS5hcHBsZS5wcmludC50aWNrZXQuc3RhdGVGbGFnPC9rZXk+CgkJ
+ CQkJPGludGVnZXI+MTwvaW50ZWdlcj4KCQkJCTwvZGljdD4KCQkJPC9hcnJheT4KCQk8
+ L2RpY3Q+CgkJPGtleT5jb20uYXBwbGUucHJpbnQudGlja2V0LkFQSVZlcnNpb248L2tl
+ eT4KCQk8c3RyaW5nPjAwLjIwPC9zdHJpbmc+CgkJPGtleT5jb20uYXBwbGUucHJpbnQu
+ dGlja2V0LnByaXZhdGVMb2NrPC9rZXk+CgkJPGZhbHNlLz4KCQk8a2V5PmNvbS5hcHBs
+ ZS5wcmludC50aWNrZXQudHlwZTwva2V5PgoJCTxzdHJpbmc+Y29tLmFwcGxlLnByaW50
+ LlBhcGVySW5mb1RpY2tldDwvc3RyaW5nPgoJPC9kaWN0PgoJPGtleT5jb20uYXBwbGUu
+ cHJpbnQudGlja2V0LkFQSVZlcnNpb248L2tleT4KCTxzdHJpbmc+MDAuMjA8L3N0cmlu
+ Zz4KCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC5wcml2YXRlTG9jazwva2V5PgoJ
+ PGZhbHNlLz4KCTxrZXk+Y29tLmFwcGxlLnByaW50LnRpY2tldC50eXBlPC9rZXk+Cgk8
+ c3RyaW5nPmNvbS5hcHBsZS5wcmludC5QYWdlRm9ybWF0VGlja2V0PC9zdHJpbmc+Cjwv
+ ZGljdD4KPC9wbGlzdD4KhpKEmZkPTlNQcmludEFsbFBhZ2VzhpKgkoSZmQtOU1BhcGVy
+ TmFtZYaShJmZCW5hLWxldHRlcoaShJmZFU5TSG9yaXpvbmFsUGFnaW5hdGlvboaShKGb
+ opcAhpKEmZkWTlNIb3Jpem9udGFsbHlDZW50ZXJlZIaSppKEmZkJTlNQcmludGVyhpKE
+ hIQJTlNQcmludGVyAJSShJmZDVN0eWx1cyBDWDUyMDCGhpKEmZkITlNDb3BpZXOGkoSh
+ m6KXAYaShJmZD05TU2NhbGluZ0ZhY3RvcoaShKGbhIQBZqEBhpKEmZkNTlNSaWdodE1h
+ cmdpboaShKGbuKEAhpKEmZkOTlNCb3R0b21NYXJnaW6GkoShm7ihAIaShJmZDE5TTGVm
+ dE1hcmdpboaShKGbuKEAhpKEmZkLTlNUb3BNYXJnaW6GkoShm7ihAIaShJmZCk5TTGFz
+ dFBhZ2WGkoShm6KXgn////+GkoSZmQtOU0ZpcnN0UGFnZYaShKGbopcBhpKEmZkNTlNP
+ cmllbnRhdGlvboaShKGbopcAhoaG
+ </data>
+ <key>ReadOnly</key>
+ <string>NO</string>
+ <key>RowAlign</key>
+ <integer>1</integer>
+ <key>RowSpacing</key>
+ <real>36</real>
+ <key>SheetTitle</key>
+ <string>Canvas 1</string>
+ <key>SmartAlignmentGuidesActive</key>
+ <string>YES</string>
+ <key>SmartDistanceGuidesActive</key>
+ <string>YES</string>
+ <key>UseEntirePage</key>
+ <true/>
+ <key>VPages</key>
+ <integer>1</integer>
+ <key>WindowInfo</key>
+ <dict>
+ <key>CurrentSheet</key>
+ <string>0</string>
+ <key>Frame</key>
+ <string>{{280, 46}, {591, 832}}</string>
+ <key>ShowRuler</key>
+ <false/>
+ <key>ShowStatusBar</key>
+ <true/>
+ <key>VisibleRegion</key>
+ <string>{{0, 0}, {576, 734}}</string>
+ <key>Zoom</key>
+ <string>1</string>
+ </dict>
+</dict>
+</plist>
Added: branches/telcos/refman-common/images/myarchitecture.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 341 bytes
Added: branches/telcos/refman-common/images/myflowchart.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 335 bytes
Added: branches/telcos/refman-common/images/myodbc-crystal-1.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 345 bytes
Added: branches/telcos/refman-common/images/myodbc-crystal-2.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 345 bytes
Added: branches/telcos/refman-common/images/myodbc-crystal-3.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 345 bytes
Added: branches/telcos/refman-common/images/myodbc-crystal-4.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 345 bytes
Added: branches/telcos/refman-common/images/myodbc-crystal-5.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 345 bytes
Added: branches/telcos/refman-common/images/myodbc-crystal-6.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 345 bytes
Added: branches/telcos/refman-common/images/myodbc-excel-step1.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 349 bytes
Added: branches/telcos/refman-common/images/myodbc-excel-step2.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 349 bytes
Added: branches/telcos/refman-common/images/myodbc-excel-step3.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 349 bytes
Added: branches/telcos/refman-common/images/myodbc-excel-step4.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 349 bytes
Added: branches/telcos/refman-common/images/myodbc-excel-step5.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 349 bytes
Added: branches/telcos/refman-common/images/myodbc-macosx-install-step1.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 367 bytes
Added: branches/telcos/refman-common/images/myodbc-macosx-install-step2.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 367 bytes
Added: branches/telcos/refman-common/images/myodbc-macosx-install-step3.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 367 bytes
Added: branches/telcos/refman-common/images/myodbc-macosx-install-step4.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 367 bytes
Added: branches/telcos/refman-common/images/myodbc-macosx-install-step5.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 367 bytes
Added: branches/telcos/refman-common/images/myodbc-macosx-install-step6.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 367 bytes
Added: branches/telcos/refman-common/images/myodbc-macosx-odbcadmin-adddsn.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 373 bytes
Added: branches/telcos/refman-common/images/myodbc-macosx-odbcadmin-main.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 369 bytes
Added: branches/telcos/refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 379 bytes
Added: branches/telcos/refman-common/images/myodbc-macosx-odbcadmin-tracing.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 375 bytes
Added: branches/telcos/refman-common/images/myodbc-win-install-step1.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 361 bytes
Added: branches/telcos/refman-common/images/myodbc-win-install-step2.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 361 bytes
Added: branches/telcos/refman-common/images/myodbc-win-install-step3.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 361 bytes
Added: branches/telcos/refman-common/images/myodbc-win-install-step4.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 361 bytes
Added: branches/telcos/refman-common/images/myodbc-win-odbcadmin-adddsn.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 367 bytes
Added: branches/telcos/refman-common/images/myodbc-win-odbcadmin-advanced.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 371 bytes
Added: branches/telcos/refman-common/images/myodbc-win-odbcadmin-driverselect.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 379 bytes
Added: branches/telcos/refman-common/images/myodbc-win-odbcadmin-main.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 363 bytes
Added: branches/telcos/refman-common/images/myodbc-win-odbcadmin-options.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 369 bytes
Added: branches/telcos/refman-common/images/myodbc-win-odbcadmin-sampledsn.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 373 bytes
Added: branches/telcos/refman-common/images/myodbc-win-tracing.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 349 bytes
Added: branches/telcos/refman-common/images/mysql-vstudioplugin-1.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 355 bytes
Added: branches/telcos/refman-common/images/mysql-vstudioplugin-2.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 355 bytes
Added: branches/telcos/refman-common/images/mysql-vstudioplugin-3.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 355 bytes
Added: branches/telcos/refman-common/images/mysql-vstudioplugin-4.png
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 355 bytes
Modified: branches/telcos/tools/make-reserved-words-new.rb
===================================================================
--- branches/telcos/tools/make-reserved-words-new.rb 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/tools/make-reserved-words-new.rb 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 4, Lines Added: 25, Lines Deleted: 2; 1686 bytes
@@ -44,11 +44,13 @@
# Variables corresponding to command-line options.
help = false
+columns = 3
language = "english"
series = nil
opts = GetoptLong.new(
[ "--help", "-h", GetoptLong::NO_ARGUMENT ],
+ [ "--columns", "-C", GetoptLong::REQUIRED_ARGUMENT ],
[ "--language", "-L", GetoptLong::REQUIRED_ARGUMENT ],
[ "--series", "-S", GetoptLong::REQUIRED_ARGUMENT ]
)
@@ -59,6 +61,8 @@
case opt
when "--help"
help = true
+ when "--columns"
+ columns = arg
when "--language"
language = arg
when "--series"
@@ -117,8 +121,12 @@
end
words = (read_words(ARGV[1]) - read_words(ARGV[0])).sort
-words.collect! { |w| "<literal>" + w + "</literal>" }
+words.collect! { |w| "<entry><literal>" + w + "</literal></entry>" }
+# pad words array if necessary so that last row is full
+words << "<entry></entry>" while (words.size % columns) != 0
+colspecs = "<colspec colwidth=\"#{(100/columns).to_i}*\"/>" * columns
+
puts <<EOF
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
@@ -128,7 +136,22 @@
<!-- To regenerate, use #{$0} -->
<para>
#{text}
-#{words.join(",\n")}.
+<informaltable>
+<tgroup cols="#{columns}">
+#{colspecs}
+<tbody>
+EOF
+
+i = 0
+while i < words.size
+ puts "<row>#{words[i...i+columns]}</row>"
+ i += columns
+end
+
+puts <<EOF
+</tbody>
+</tgroup>
+</informaltable>
</para>
<!-- END_OF_NEW_RESERVED_WORDS_INFO -->
EOF
Modified: branches/telcos/tools/update-reserved-words.pl
===================================================================
--- branches/telcos/tools/update-reserved-words.pl 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/tools/update-reserved-words.pl 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 607 bytes
@@ -235,7 +235,7 @@
$list .= "<tbody>\n";
for($i=0; $word = shift(@words); $i++) {
$list .= " <row>\n" if $i%3 == 0;
- $list .= " <entry>$word</entry>\n";
+ $list .= " <entry><literal>$word</literal></entry>\n";
$list .= " </row>\n" if $i%3 == 2;
}
# Fill last row to full # of columns.
Modified: branches/telcos/tools/xmlformat.conf
===================================================================
--- branches/telcos/tools/xmlformat.conf 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/tools/xmlformat.conf 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 478 bytes
@@ -43,7 +43,7 @@
entry-break 1
exit-break 1
-para remark textobject releaseinfo term
+para remark textobject releaseinfo term formalpara
format block
entry-break 1
exit-break 1
Modified: branches/telcos/xsl.d/dbk-texi.xsl
===================================================================
--- branches/telcos/xsl.d/dbk-texi.xsl 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/xsl.d/dbk-texi.xsl 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 24, Lines Added: 43, Lines Deleted: 29; 7079 bytes
@@ -54,9 +54,9 @@
<!-- Identity transform - handles everything not otherwise listed below -->
-<xsl:template match="/ | node() | @* | processing-instruction()">
+<xsl:template match="/ | node() | processing-instruction()">
<xsl:copy>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:copy>
</xsl:template>
@@ -322,7 +322,7 @@
<xsl:template match="chapter|appendix|section">
<xsl:call-template name="generate-node"/>
<xsl:call-template name="generate-menu"/>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:template>
<!-- <title> -> delete it unless in noignore mode -->
@@ -330,7 +330,7 @@
<xsl:template match="title"/>
<xsl:template match="title" mode="noignore">
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:template>
<!-- lists -->
@@ -339,7 +339,7 @@
<xsl:value-of select="$newline"/>
<xsl:text>@itemize @bullet</xsl:text>
<xsl:value-of select="$newline"/>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>@end itemize</xsl:text>
<xsl:value-of select="$newline"/>
</xsl:template>
@@ -348,7 +348,7 @@
<xsl:value-of select="$newline"/>
<xsl:text>@enumerate</xsl:text>
<xsl:value-of select="$newline"/>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>@end enumerate</xsl:text>
<xsl:value-of select="$newline"/>
</xsl:template>
@@ -357,7 +357,7 @@
<xsl:value-of select="$newline"/>
<xsl:text>@item</xsl:text>
<xsl:value-of select="$newline"/>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:template>
<!-- tables -->
@@ -379,7 +379,7 @@
<xsl:value-of select="translate(@colwidth,'*','')"/>
</xsl:for-each>
<xsl:value-of select="$newline"/>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>@end multitable</xsl:text>
<xsl:value-of select="$newline"/>
</xsl:template>
@@ -390,7 +390,7 @@
-->
<xsl:template match="tgroup|colspec|tbody|row">
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:template>
<!-- <entry> -> item in @multitable row -->
@@ -402,13 +402,13 @@
<xsl:template match="entry[1]">
<xsl:value-of select="$newline"/>
<xsl:text>@item </xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:template>
<xsl:template match="entry">
<xsl:value-of select="$newline"/>
<xsl:text>@tab </xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:template>
<!-- <programlisting> -> @example -->
@@ -417,7 +417,7 @@
<xsl:value-of select="$newline"/>
<xsl:text>@example</xsl:text>
<xsl:value-of select="$newline"/>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>@end example</xsl:text>
<xsl:value-of select="$newline"/>
</xsl:template>
@@ -427,7 +427,7 @@
<xsl:template match="literallayout">
<xsl:value-of select="$newline"/>
<xsl:text>@display</xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>@end display</xsl:text>
<xsl:value-of select="$newline"/>
</xsl:template>
@@ -445,9 +445,23 @@
<xsl:value-of select="@id"/>
<xsl:text>}</xsl:text>
</xsl:if>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:template>
+<!-- <formalpara> - wrapper with title for para -->
+
+<xsl:template match="formalpara">
+ <xsl:value-of select="$newline"/>
+ <xsl:if test="@id">
+ <xsl:text>@anchor{</xsl:text>
+ <xsl:value-of select="@id"/>
+ <xsl:text>}</xsl:text>
+ </xsl:if>
+ <xsl:apply-templates select="title" mode="noignore"/>
+ <xsl:value-of select="$newline"/>
+ <xsl:apply-templates/>
+</xsl:template>
+
<xsl:template match="example">
<xsl:value-of select="$newline"/>
<xsl:if test="@id">
@@ -455,7 +469,7 @@
<xsl:value-of select="@id"/>
<xsl:text>}</xsl:text>
</xsl:if>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:template>
<xsl:template match="figure">
@@ -499,7 +513,7 @@
</xsl:choose>
<xsl:text>}:</xsl:text>
<xsl:value-of select="$newline"/>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:template>
<!--
@@ -559,7 +573,7 @@
<xsl:template match="emphasis[@role='bold']">
<xsl:text>@strong{</xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>}</xsl:text>
</xsl:template>
@@ -570,7 +584,7 @@
|foreignphrase
">
<xsl:text>@emph{</xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>}</xsl:text>
</xsl:template>
@@ -578,7 +592,7 @@
<xsl:template match="filename">
<xsl:text>@file{</xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>}</xsl:text>
</xsl:template>
@@ -599,7 +613,7 @@
|option
">
<xsl:text>@code{</xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>}</xsl:text>
</xsl:template>
@@ -607,7 +621,7 @@
<xsl:template match="replaceable">
<xsl:text>@var{</xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>}</xsl:text>
</xsl:template>
@@ -615,21 +629,21 @@
<xsl:template match="quote">
<xsl:text>@samp{</xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>}</xsl:text>
</xsl:template>
<!-- <userinput> -> nothing (just delete the tags) -->
<xsl:template match="userinput">
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:template>
<!-- <email> -> @email{} -->
<xsl:template match="email">
<xsl:text>@email{</xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>}</xsl:text>
</xsl:template>
@@ -637,7 +651,7 @@
<xsl:template match="superscript">
<xsl:text>^</xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:template>
<!-- <xref> -> @ref{} (ignore content) -->
@@ -668,11 +682,11 @@
<xsl:text>@ref{</xsl:text>
<xsl:value-of select="@linkend"/>
<xsl:text>,,</xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>}</xsl:text>
</xsl:when>
<xsl:otherwise>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
@@ -685,7 +699,7 @@
<xsl:with-param name="text" select="@url"/>
</xsl:call-template>
<xsl:text>,</xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>}</xsl:text>
</xsl:template>
@@ -693,7 +707,7 @@
<xsl:template match="citetitle">
<xsl:text>@cite{</xsl:text>
- <xsl:apply-templates select="@* | node()"/>
+ <xsl:apply-templates/>
<xsl:text>}</xsl:text>
</xsl:template>
Modified: branches/telcos/xsl.d/help-prep2.xsl
===================================================================
--- branches/telcos/xsl.d/help-prep2.xsl 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/xsl.d/help-prep2.xsl 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 694 bytes
@@ -196,7 +196,7 @@
- <itemizedlist>
- <orderedlist>
- <listitem>
- - <para>
+ - <para>, <formalpara>
- <programlisting>
-->
@@ -224,7 +224,7 @@
<xsl:value-of select="$newline"/>
</xsl:template>
-<xsl:template match="para" mode="extract.text">
+<xsl:template match="para|formalpara" mode="extract.text">
<xsl:text>@HELP-TEXT-BEGIN WRAP</xsl:text>
<xsl:value-of select="$newline"/>
<xsl:call-template name="map-text">
Modified: branches/telcos/xsl.d/mysql-fo.xsl
===================================================================
--- branches/telcos/xsl.d/mysql-fo.xsl 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/xsl.d/mysql-fo.xsl 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 105, Lines Deleted: 97; 10257 bytes
@@ -13,122 +13,130 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:import href="docbook-xsl/fo/docbook.xsl" />
+ <xsl:import href="docbook-xsl/fo/docbook.xsl"/>
-<xsl:include href="mysql.titlepage.templates.fo.xsl" />
+ <!-- Import custom formalpara templates (used for special notices) -->
+
+ <xsl:import href="mysql.formalpara.templates.fo.xsl"/>
+
+ <xsl:include href="mysql.titlepage.templates.fo.xsl"/>
+
+ <xsl:template match="command">s
+ <xsl:call-template name="inline.monoseq"/>
+ </xsl:template>
+ <xsl:template match="guilabel">
+ <xsl:call-template name="inline.monoseq"/>
+ </xsl:template>
+ <xsl:template match="guibutton">
+ <xsl:call-template name="inline.monoseq"/>
+ </xsl:template>
+
+ <xsl:param name="fop.extensions" select="1"/>
-<xsl:template match="command">
- <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-<xsl:template match="guilabel">
- <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-<xsl:template match="guibutton">
- <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
+ <xsl:param name="section.autolabel" select="1"/>
+ <xsl:param name="section.label.includes.component.label" select="1"/>
-<xsl:param name="fop.extensions" select="1"/>
+ <xsl:param name="page.margin.inner" select="'1in'"/>
+ <xsl:param name="page.margin.outer" select="'1in'"/>
+ <xsl:param name="draft.mode" select="no"/>
-<xsl:param name="section.autolabel" select="1"/>
-<xsl:param name="section.label.includes.component.label" select="1"/>
+ <xsl:param name="body.font.family">Times Roman</xsl:param>
+ <xsl:param name="body.font.master">10</xsl:param>
+ <xsl:param name="title.font.family">Helvetica,Verdana,Arial,Sans Serif</xsl:param>
+ <xsl:param name="monospace.font.family">Courier</xsl:param>
-<xsl:param name="page.margin.inner" select="'1in'"/>
-<xsl:param name="page.margin.outer" select="'1in'"/>
-<xsl:param name="draft.mode" select="no"/>
+ <xsl:attribute-set name="component.title.properties">
+ <xsl:attribute name="font-size">22pt</xsl:attribute>
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
+ </xsl:attribute-set>
-<xsl:param name="body.font.family">Times Roman</xsl:param>
-<xsl:param name="body.font.master">10</xsl:param>
-<xsl:param name="title.font.family">Helvetica,Verdana,Arial,Sans Serif</xsl:param>
-<xsl:param name="monospace.font.family">Courier</xsl:param>
+ <xsl:attribute-set name="section.title.level1.properties">
+ <xsl:attribute name="font-size">18pt</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ </xsl:attribute-set>
-<xsl:attribute-set name="component.title.properties">
- <xsl:attribute name="font-size">22pt</xsl:attribute>
- <xsl:attribute name="font-weight">normal</xsl:attribute>
-</xsl:attribute-set>
+ <xsl:attribute-set name="section.title.level2.properties">
+ <xsl:attribute name="font-size">16pt</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ </xsl:attribute-set>
-<xsl:attribute-set name="section.title.level1.properties">
- <xsl:attribute name="font-size">18pt</xsl:attribute>
- <xsl:attribute name="font-weight">bold</xsl:attribute>
-</xsl:attribute-set>
+ <xsl:attribute-set name="section.title.level3.properties">
+ <xsl:attribute name="font-size">14pt</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ </xsl:attribute-set>
-<xsl:attribute-set name="section.title.level2.properties">
- <xsl:attribute name="font-size">16pt</xsl:attribute>
- <xsl:attribute name="font-weight">bold</xsl:attribute>
-</xsl:attribute-set>
+ <xsl:attribute-set name="section.title.level4.properties">
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ </xsl:attribute-set>
-<xsl:attribute-set name="section.title.level3.properties">
- <xsl:attribute name="font-size">14pt</xsl:attribute>
- <xsl:attribute name="font-weight">bold</xsl:attribute>
-</xsl:attribute-set>
+ <xsl:attribute-set name="section.title.level5.properties">
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ </xsl:attribute-set>
-<xsl:attribute-set name="section.title.level4.properties">
- <xsl:attribute name="font-size">12pt</xsl:attribute>
- <xsl:attribute name="font-weight">bold</xsl:attribute>
-</xsl:attribute-set>
+ <xsl:attribute-set name="section.title.level6.properties">
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
+ </xsl:attribute-set>
-<xsl:attribute-set name="section.title.level5.properties">
- <xsl:attribute name="font-size">10pt</xsl:attribute>
- <xsl:attribute name="font-weight">bold</xsl:attribute>
-</xsl:attribute-set>
+ <xsl:attribute-set name="xref.properties">
+ <xsl:attribute name="color">blue</xsl:attribute>
+ </xsl:attribute-set>
-<xsl:attribute-set name="section.title.level6.properties">
- <xsl:attribute name="font-size">10pt</xsl:attribute>
- <xsl:attribute name="font-weight">normal</xsl:attribute>
-</xsl:attribute-set>
+ <xsl:attribute-set name="monospace.properties">
+ <xsl:attribute name="color">#026789</xsl:attribute>
+ </xsl:attribute-set>
-<xsl:attribute-set name="xref.properties">
- <xsl:attribute name="color">blue</xsl:attribute>
-</xsl:attribute-set>
+ <xsl:attribute-set name="admonition.title.properties">
+ <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
+ <xsl:attribute name="space-before.optimum">0em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">0em</xsl:attribute>
+ <xsl:attribute name="font-family">Helvetica,Verdana,Arial,Sans Serif</xsl:attribute>
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ <xsl:attribute name="margin-left">0.25in</xsl:attribute>
+ <xsl:attribute name="margin-right">0.25in</xsl:attribute>
+ <xsl:attribute name="border-left">5pt solid black</xsl:attribute>
+ <xsl:attribute name="padding-left">0.1in</xsl:attribute>
+ </xsl:attribute-set>
- <xsl:attribute-set name="monospace.properties"><xsl:attribute name="color">#026789</xsl:attribute></xsl:attribute-set>
-
-<xsl:attribute-set name="admonition.title.properties">
- <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
- <xsl:attribute name="space-before.optimum">0em</xsl:attribute>
- <xsl:attribute name="space-before.maximum">0em</xsl:attribute>
- <xsl:attribute name="font-family">Helvetica,Verdana,Arial,Sans Serif</xsl:attribute>
- <xsl:attribute name="font-size">10pt</xsl:attribute>
- <xsl:attribute name="font-weight">bold</xsl:attribute>
- <xsl:attribute name="margin-left">0.25in</xsl:attribute>
- <xsl:attribute name="margin-right">0.25in</xsl:attribute>
- <xsl:attribute name="border-left">5pt solid black</xsl:attribute>
- <xsl:attribute name="padding-left">0.1in</xsl:attribute>
-</xsl:attribute-set>
+ <xsl:attribute-set name="admonition.properties">
+ <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
+ <xsl:attribute name="space-before.optimum">0em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">0em</xsl:attribute>
+ <xsl:attribute name="margin-left">0.25in</xsl:attribute>
+ <xsl:attribute name="margin-right">0.25in</xsl:attribute>
+ <xsl:attribute name="border-left">5px solid black</xsl:attribute>
+ <xsl:attribute name="padding-left">0.1in</xsl:attribute>
+ </xsl:attribute-set>
-<xsl:attribute-set name="admonition.properties">
- <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
- <xsl:attribute name="space-before.optimum">0em</xsl:attribute>
- <xsl:attribute name="space-before.maximum">0em</xsl:attribute>
- <xsl:attribute name="margin-left">0.25in</xsl:attribute>
- <xsl:attribute name="margin-right">0.25in</xsl:attribute>
- <xsl:attribute name="border-left">5px solid black</xsl:attribute>
- <xsl:attribute name="padding-left">0.1in</xsl:attribute>
-</xsl:attribute-set>
+ <xsl:attribute-set name="formal.title.properties">
+ <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+ <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
+ <xsl:attribute name="font-family">Helvetica,Verdana,Arial,Sans Serif</xsl:attribute>
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ </xsl:attribute-set>
-<xsl:attribute-set name="formal.title.properties">
- <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
- <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
- <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
- <xsl:attribute name="font-family">Helvetica,Verdana,Arial,Sans Serif</xsl:attribute>
- <xsl:attribute name="font-size">10pt</xsl:attribute>
- <xsl:attribute name="font-weight">bold</xsl:attribute>
-</xsl:attribute-set>
+ <xsl:attribute-set name="verbatim.properties">
+ <xsl:attribute name="background-color">#dddddd</xsl:attribute>
+ <xsl:attribute name="color">#000000</xsl:attribute>
+ <xsl:attribute name="padding">1px</xsl:attribute>
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$body.font.master * 0.8"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ </xsl:attribute-set>
-<xsl:attribute-set name="verbatim.properties">
- <xsl:attribute name="background-color">#dddddd</xsl:attribute>
- <xsl:attribute name="color">#000000</xsl:attribute>
- <xsl:attribute name="padding">1px</xsl:attribute>
- <xsl:attribute name="font-size">
- <xsl:value-of select="$body.font.master * 0.8"></xsl:value-of>
- <xsl:text>pt</xsl:text>
- </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="root.properties">
- <xsl:attribute name="text-align">
- <xsl:text>left</xsl:text>
- </xsl:attribute>
-</xsl:attribute-set>
+ <xsl:attribute-set name="root.properties">
+ <xsl:attribute name="text-align">
+ <xsl:text>left</xsl:text>
+ </xsl:attribute>
+ </xsl:attribute-set>
+
</xsl:stylesheet>
Modified: branches/telcos/xsl.d/mysql-html-section.xsl
===================================================================
--- branches/telcos/xsl.d/mysql-html-section.xsl 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/xsl.d/mysql-html-section.xsl 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 600 bytes
@@ -9,6 +9,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:import href="docbook-xsl/html/chunkfast.xsl"/>
+<xsl:import href="mysql.formalpara.templates.html.xsl"/>
+
<xsl:include href="mysql-disclaimer-html.xsl"/>
<xsl:param name="generate.section.toc.level" select="8"/>
Modified: branches/telcos/xsl.d/mysql-html.css
===================================================================
--- branches/telcos/xsl.d/mysql-html.css 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/xsl.d/mysql-html.css 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 2, Lines Added: 60, Lines Deleted: 1; 1470 bytes
@@ -82,12 +82,31 @@
color:black;
background-color:white;
}
-div.warning, div.note {
+
+div.note {
border-left: 5px solid black;
padding-left: 5px;
margin-right: 1in;
}
+div.warning {
+ border-left: 5px solid red;
+ padding-left: 5px;
+ margin-right: 1in;
+}
+
+p.mnmas b {
+ display:block;
+ color: green;
+}
+
+p.mnmas {
+ color: green;
+ border: 1px solid green;
+ border-left: 5px solid green;
+ padding-left: 5px;
+}
+
div.warning h3, div.note h3{
font-size: 90%;
}
@@ -290,4 +309,44 @@
font-style: normal;
}
+table.docs-document-list {
+ border-style: none;
+ font-size: 10px;
+ font-size: helvetica, arial, sans-serif;
+ border: none;
+}
+table.docs-document-list tr.title {
+ text-align: center;
+ vertical-align: bottom;
+ font-weight: bold;
+}
+
+table.docs-document-list tr.even {
+ valign: bottom;
+ background-color: #efefef;
+ border: 0px;
+}
+
+table.docs-document-list tr.odd {
+ valign: bottom;
+ backgroud-color: white;
+ border: 0px;
+}
+
+table.docs-document-list td {
+ padding:0px 5px 0px 5px;
+ border: none;
+}
+
+table.docs-document-list td.title {
+ align: left;
+ valign: bottom;
+ border: 0px;
+}
+
+table.docs-document-list td.link {
+ width: 70px;
+ text-align: center;
+ border: 0px;
+}
Modified: branches/telcos/xsl.d/mysql-html.xsl
===================================================================
--- branches/telcos/xsl.d/mysql-html.xsl 2007-01-13 03:04:20 UTC (rev 4499)
+++ branches/telcos/xsl.d/mysql-html.xsl 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 525 bytes
@@ -8,6 +8,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:import href="docbook-xsl/html/docbook.xsl"/>
+<xsl:import href="mysql.formalpara.templates.html.xsl"/>
<xsl:output method="html" encoding="utf-8" indent="no"/>
Modified: trunk/refman-4.1/connectors.xml
===================================================================
--- trunk/refman-4.1/connectors.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ trunk/refman-4.1/connectors.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 2, Lines Added: 14, Lines Deleted: 0; 994 bytes
@@ -31,6 +31,10 @@
</indexterm>
<indexterm>
+ <primary>Visual Studio Plugin</primary>
+ </indexterm>
+
+ <indexterm>
<primary>Connector/MXJ</primary>
</indexterm>
@@ -64,6 +68,16 @@
<listitem>
<para>
+ The MySQL Visual Studio Plugin works with Connector/NET and
+ Visual Studio 2005. The plugin is a MySQL DDEX Provider, which
+ means that you can use the schema and data manipulation tools
+ within Visual Studio to create and edit objects within a MySQL
+ database.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Connector/J provides driver support for connecting to MySQL from
a Java application using the standard Java Database Connectivity
(JDBC) API.
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ trunk/refman-4.1/database-administration.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 869 bytes
@@ -24822,8 +24822,8 @@
<para>
The query cache works for <literal>SELECT SQL_CALC_FOUND_ROWS
- ...</literal> type queries and store a value that a following
- <literal>SELECT FOUND_ROWS()</literal> query will return.
+ ...</literal> queries and stores a value that is returned by a
+ following <literal>SELECT FOUND_ROWS()</literal> query.
<literal>FOUND_ROWS()</literal> returns the correct value even
if the preceding query was fetched from the cache because the
number of found rows is also stored in the cache. The
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ trunk/refman-5.0/database-administration.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 869 bytes
@@ -28230,8 +28230,8 @@
<para>
The query cache works for <literal>SELECT SQL_CALC_FOUND_ROWS
- ...</literal> type queries and store a value that a following
- <literal>SELECT FOUND_ROWS()</literal> query will return.
+ ...</literal> queries and stores a value that is returned by a
+ following <literal>SELECT FOUND_ROWS()</literal> query.
<literal>FOUND_ROWS()</literal> returns the correct value even
if the preceding query was fetched from the cache because the
number of found rows is also stored in the cache. The
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ trunk/refman-5.1/database-administration.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 869 bytes
@@ -28963,8 +28963,8 @@
<para>
The query cache works for <literal>SELECT SQL_CALC_FOUND_ROWS
- ...</literal> type queries and store a value that a following
- <literal>SELECT FOUND_ROWS()</literal> query will return.
+ ...</literal> queries and stores a value that is returned by a
+ following <literal>SELECT FOUND_ROWS()</literal> query.
<literal>FOUND_ROWS()</literal> returns the correct value even
if the preceding query was fetched from the cache because the
number of found rows is also stored in the cache. The
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ trunk/refman-5.1/installing.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 709 bytes
@@ -8605,7 +8605,7 @@
<programlisting>shell> bkf changes -vvr<replaceable>CSETID</replaceable></programlisting>
<para>
- If you see some funny diffs or code that you have a question
+ If you see diffs or code that you have a question
about, do not hesitate to send email to the MySQL
<literal>internals</literal> mailing list. See
<xref linkend="mailing-lists"/>. Also, if you think you have
Modified: trunk/refman-5.1/news-5.1.xml
===================================================================
--- trunk/refman-5.1/news-5.1.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ trunk/refman-5.1/news-5.1.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 3; 845 bytes
@@ -12229,9 +12229,7 @@
<literal>SUPER</literal> privilege has changed to a
requirement for the <literal>TRIGGER</literal> privilege.
After upgrading, be sure to update your grant tables as
- described in
- <xref
- linkend="mysql-fix-privilege-tables"/>. This
+ described in <xref linkend="mysql-fix-privilege-tables"/>. This
process assigns the <literal>TRIGGER</literal> privilege to
all accounts that had the <literal>SUPER</literal> privilege.
(After updating, you might also consider whether any of those
Modified: trunk/refman-5.1/se-federated.xml
===================================================================
--- trunk/refman-5.1/se-federated.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ trunk/refman-5.1/se-federated.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 712 bytes
@@ -356,7 +356,7 @@
<literal>TRUNCATE</literal>, and indexes. It does not support
<literal>ALTER TABLE</literal>, or any Data Definition
Language statements other than <literal>DROP TABLE</literal>.
- The current implementation does not use Prepared statements.
+ The current implementation does not use prepared statements.
<remark>
It remains to be seen whether the limited subset of the
Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml 2007-01-13 03:04:20 UTC (rev 4499)
+++ trunk/refman-5.1/storage-engines.xml 2007-01-13 08:11:41 UTC (rev 4500)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 14; 2665 bytes
@@ -118,7 +118,8 @@
</para>
<para>
- The MySQL pluggable storage engine architecture in shown in <xref linkend="figure-storage-engine-architecture"/>.
+ The MySQL pluggable storage engine architecture is shown in
+ <xref linkend="figure-storage-engine-architecture"/>.
</para>
<figure id="figure-storage-engine-architecture">
@@ -822,19 +823,15 @@
Forge Storage Engines</ulink> page.
</para>
- <formalpara>
-
- <title>Note</title>
-
+ <note>
<para>
Third party engines are not supported by MySQL. For further
information, documentation, installation guides, bug reporting
or for any any help or assistance with these engines, please
contact the developer of the engine directly.
</para>
+ </note>
- </formalpara>
-
<para>
Third party engines that are known to be available include the
following; please see the MySQL Forge links provided for more
@@ -874,18 +871,16 @@
<listitem>
<para>
- <emphasis role="bold"><ulink
- url="http://forge.mysql.com/projects/view.php?id=98">mdbtools</ulink></emphasis>
+ <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/view.php?id=98">mdbtools</ulink></emphasis>
— A pluggable storage engine that allows read-only
- access to MicroSoft Access <literal>.mdb</literal> database
+ access to Microsoft Access <filename>.mdb</filename> database
files.
</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold"><ulink
- url="http://forge.mysql.com/projects/view.php?id=139">solidDB
+ <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/view.php?id=139">solidDB
for MySQL</ulink></emphasis> — solidDB Storage Engine
for MySQL is an open source, transactional storage engine
for MySQL Server. It is designed for mission-critical
@@ -903,8 +898,7 @@
<para>
For more information on developing a customer storage engine
that can be used with the Pluggable Storage Engine Architecture,
- see <xref
- linkend="custom-engine"/>, of the MySQL Internals manual.
+ see <xref linkend="custom-engine"/>, in the MySQL Internals manual.
</para>
</section>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r4500 - branches/telcos branches/telcos/make.d branches/telcos/refman-4.1 branches/telcos/refman-5.0 branches/telcos/re... | jon | 13 Jan |
