Author: paul
Date: 2006-01-18 20:31:35 +0100 (Wed, 18 Jan 2006)
New Revision: 903
Log:
r2296@kite-hub: paul | 2006-01-18 12:14:11 -0600
Change section id.
Modified:
trunk/
trunk/refman-4.1/language-structure.xml
trunk/refman-4.1/renamed-nodes.txt
trunk/refman-4.1/sql-syntax.xml
trunk/refman-4.1/tutorial.xml
trunk/refman-5.0/language-structure.xml
trunk/refman-5.0/renamed-nodes.txt
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.0/stored-procedures.xml
trunk/refman-5.0/tutorial.xml
trunk/refman-5.1/data-types.xml
trunk/refman-5.1/language-structure.xml
trunk/refman-5.1/renamed-nodes.txt
trunk/refman-5.1/sql-syntax.xml
trunk/refman-5.1/stored-procedures.xml
trunk/refman-5.1/tutorial.xml
trunk/refman-common/titles.en.ent
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6354
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2295
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6354
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2296
Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-4.1/language-structure.xml 2006-01-18 19:31:35 UTC (rev 903)
@@ -1295,9 +1295,9 @@
</section>
- <section id="variables">
+ <section id="user-variables">
- <title>&title-variables;</title>
+ <title>&title-user-variables;</title>
<indexterm>
<primary>variables</primary>
Modified: trunk/refman-4.1/renamed-nodes.txt
===================================================================
--- trunk/refman-4.1/renamed-nodes.txt 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-4.1/renamed-nodes.txt 2006-01-18 19:31:35 UTC (rev 903)
@@ -100,3 +100,4 @@
charset-defaults charset-syntax
charset-config-file adding-character-set
open-tables table-cache
+variables user-variables
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-4.1/sql-syntax.xml 2006-01-18 19:31:35 UTC (rev 903)
@@ -12378,7 +12378,7 @@
<para>
Further information about user variables is given in
- <xref linkend="variables"/>.
+ <xref linkend="user-variables"/>.
</para>
<para>
Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-4.1/tutorial.xml 2006-01-18 19:31:35 UTC (rev 903)
@@ -3403,7 +3403,7 @@
<para>
You can employ MySQL user variables to remember results without
having to store them in temporary variables in the client. (See
- <xref linkend="variables"/>.)
+ <xref linkend="user-variables"/>.)
</para>
<para>
Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-5.0/language-structure.xml 2006-01-18 19:31:35 UTC (rev 903)
@@ -1276,9 +1276,9 @@
</section>
- <section id="variables">
+ <section id="user-variables">
- <title>&title-variables;</title>
+ <title>&title-user-variables;</title>
<indexterm>
<primary>variables</primary>
Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-5.0/renamed-nodes.txt 2006-01-18 19:31:35 UTC (rev 903)
@@ -397,3 +397,4 @@
charset-defaults charset-syntax
charset-config-file adding-character-set
open-tables table-cache
+variables user-variables
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-5.0/sql-syntax.xml 2006-01-18 19:31:35 UTC (rev 903)
@@ -13610,7 +13610,7 @@
<para>
Further information about user variables is given in
- <xref linkend="variables"/>.
+ <xref linkend="user-variables"/>.
</para>
<para>
Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-5.0/stored-procedures.xml 2006-01-18 19:31:35 UTC (rev 903)
@@ -1154,7 +1154,7 @@
<para>
User variable names are not case sensitive. See
- <xref linkend="variables"/>.
+ <xref linkend="user-variables"/>.
</para>
<para>
Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-5.0/tutorial.xml 2006-01-18 19:31:35 UTC (rev 903)
@@ -3265,7 +3265,7 @@
<para>
You can employ MySQL user variables to remember results without
having to store them in temporary variables in the client. (See
- <xref linkend="variables"/>.)
+ <xref linkend="user-variables"/>.)
</para>
<para>
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-5.1/data-types.xml 2006-01-18 19:31:35 UTC (rev 903)
@@ -21,8 +21,8 @@
chapter first gives an overview of these data types, and then
provides a more detailed description of the properties of the types
in each category, and a summary of the data type storage
- requirements. The overview is intentionally brief. The more detailed
- descriptions should be consulted for additional information about
+ requirements. The initial overview is intentionally brief. The more detailed
+ descriptions later in the chapter should be consulted for additional information about
particular data types, such as the allowable formats in which you
can specify values.
</para>
@@ -1258,7 +1258,8 @@
<programlisting>
mysql> <userinput>CREATE TABLE c1 (col1 INT, col2 CHAR(500));</userinput>
-ERROR 1074 (42000): Column length too big for column 'col' (max = 255); use BLOB or TEXT instead
+ERROR 1074 (42000): Column length too big for column 'col' (max = 255);
+use BLOB or TEXT instead
mysql> <userinput>SHOW CREATE TABLE c1;</userinput>
ERROR 1146 (42S02): Table 'test.c1' doesn't exist
</programlisting>
@@ -1932,7 +1933,7 @@
All integer types can have an optional (non-standard) attribute
<literal>UNSIGNED</literal>. Unsigned values can be used when you
want to allow only non-negative numbers in a column and you need a
- bigger upper numeric range for the column.
+ larger upper numeric range for the column.
</para>
<para>
Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-5.1/language-structure.xml 2006-01-18 19:31:35 UTC (rev 903)
@@ -1276,9 +1276,9 @@
</section>
- <section id="variables">
+ <section id="user-variables">
- <title>&title-variables;</title>
+ <title>&title-user-variables;</title>
<indexterm>
<primary>variables</primary>
Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-5.1/renamed-nodes.txt 2006-01-18 19:31:35 UTC (rev 903)
@@ -101,3 +101,4 @@
charset-defaults charset-syntax
charset-config-file adding-character-set
open-tables table-cache
+variables user-variables
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-5.1/sql-syntax.xml 2006-01-18 19:31:35 UTC (rev 903)
@@ -14098,7 +14098,7 @@
<para>
Further information about user variables is given in
- <xref linkend="variables"/>.
+ <xref linkend="user-variables"/>.
</para>
<para>
Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-5.1/stored-procedures.xml 2006-01-18 19:31:35 UTC (rev 903)
@@ -1125,7 +1125,7 @@
<para>
User variable names are not case sensitive. See
- <xref linkend="variables"/>.
+ <xref linkend="user-variables"/>.
</para>
<para>
Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-5.1/tutorial.xml 2006-01-18 19:31:35 UTC (rev 903)
@@ -3259,7 +3259,7 @@
<para>
You can employ MySQL user variables to remember results without
having to store them in temporary variables in the client. (See
- <xref linkend="variables"/>.)
+ <xref linkend="user-variables"/>.)
</para>
<para>
Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent 2006-01-18 19:30:56 UTC (rev 902)
+++ trunk/refman-common/titles.en.ent 2006-01-18 19:31:35 UTC (rev 903)
@@ -1377,7 +1377,7 @@
<!ENTITY title-problems-with-alias "Problems with Column Aliases">
<!ENTITY title-problems-with-character-sets "Problems With Character Sets">
<!ENTITY title-problems-with-float "Problems with Floating-Point Comparisons">
-<!ENTITY title-problems-with-mysql-sock "How to Protect or Change the MySQL Socket File <filename>/tmp/mysql.sock</filename>">
+<!ENTITY title-problems-with-mysql-sock "How to Protect or Change the MySQL Unix Socket File">
<!ENTITY title-problems-with-null "Problems with <literal>NULL</literal> Values">
<!ENTITY title-procedure-analyse "Procedure Analyse">
<!ENTITY title-program-options "Specifying Program Options">
@@ -1658,6 +1658,7 @@
<!ENTITY title-user-names "MySQL Usernames and Passwords">
<!ENTITY title-user-privileges-table "The <literal>INFORMATION_SCHEMA USER_PRIVILEGES</literal> Table">
<!ENTITY title-user-resources "Limiting Account Resources">
+<!ENTITY title-user-variables "User-Defined Variables">
<!ENTITY title-using-a-spatial-index "Using a Spatial Index">
<!ENTITY title-using-date "Problems Using <literal>DATE</literal> Columns">
<!ENTITY title-using-gdb-on-mysqld "Debugging <command>mysqld</command> under <command>gdb</command>">
@@ -1666,7 +1667,6 @@
<!ENTITY title-using-mysql-programs "Using MySQL Programs">
<!ENTITY title-using-stack-trace "Using a Stack Trace">
<!ENTITY title-using-triggers "Using Triggers">
-<!ENTITY title-variables "User-Defined Variables">
<!ENTITY title-variables-in-stored-procedures "Variables in Stored Routines">
<!ENTITY title-vb-types "How Do I Map Visual Basic Data Types to MySQL Types?">
<!ENTITY title-verifying-md5-checksum "Verifying the MD5 Checksum">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r903 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 18 Jan |
