List:Commits« Previous MessageNext Message »
From:paul Date:January 6 2006 4:01am
Subject:svn commit - mysqldoc@docsrva: r700 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-06 05:01:37 +0100 (Fri, 06 Jan 2006)
New Revision: 700

Log:
 r5902@frost:  paul | 2006-01-05 20:48:17 -0600
 current database -> default database (use only one of terms, not both)


Modified:
   trunk/
   trunk/refman-4.1/client-side-scripts.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/language-structure.xml
   trunk/refman-4.1/problems.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-4.1/tutorial.xml
   trunk/refman-5.0/client-side-scripts.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/language-structure.xml
   trunk/refman-5.0/problems.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.0/stored-procedures.xml
   trunk/refman-5.0/tutorial.xml
   trunk/refman-5.0/views.xml
   trunk/refman-5.1/client-side-scripts.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/language-structure.xml
   trunk/refman-5.1/problems.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-5.1/stored-procedures.xml
   trunk/refman-5.1/tutorial.xml
   trunk/refman-5.1/views.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5898
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1933
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5902
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1933

Modified: trunk/refman-4.1/client-side-scripts.xml
===================================================================
--- trunk/refman-4.1/client-side-scripts.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-4.1/client-side-scripts.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -2482,7 +2482,7 @@
               </row>
               <row>
                 <entry><literal>\d</literal></entry>
-                <entry>The current database</entry>
+                <entry>The default database</entry>
               </row>
               <row>
                 <entry><literal>\h</literal></entry>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-4.1/database-administration.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -12360,7 +12360,7 @@
       <para>
         The <literal>user</literal> table grants privileges that are
         assigned to you on a global basis and that apply no matter what
-        the current database is. For example, if the
+        the default database is. For example, if the
         <literal>user</literal> table grants you the
         <literal>DELETE</literal> privilege, you can delete rows from
         any table in any database on the server host! In other words,
@@ -21225,7 +21225,7 @@
 
           <para>
             Tells the master that it should log updates to the binary
-            log if the current database (that is, the one selected by
+            log if the default database (that is, the one selected by
             <literal>USE</literal>) is
             <replaceable>db_name</replaceable>. All other databases that
             are not explicitly mentioned are ignored. If you use this,
@@ -21237,7 +21237,7 @@
             Observe that there is an exception to the
             <literal>CREATE/ALTER/DROP DATABASE</literal> statements,
             which use the database manipulated to decide if it should
-            log the statement rather than the current database.
+            log the statement rather than the default database.
           </para>
 
           <para>
@@ -21256,11 +21256,11 @@
           </para>
 
           <para>
-            Tells the master that updates where the current database
+            Tells the master that updates where the default database
             (that is, the one selected by <literal>USE</literal>) is
             <replaceable>db_name</replaceable> should not be stored in
             the binary log. If you use this, you should ensure that you
-            only do updates in the current database.
+            only do updates in the default database.
           </para>
 
           <para>
@@ -21278,7 +21278,7 @@
             <literal>CREATE</literal>/<literal>ALTER</literal>/<literal>DROP</literal>
             <literal>DATABASE</literal> statements, which use the
             database manipulated to decide if it should log the
-            statement rather than the current database.
+            statement rather than the default database.
           </para>
         </listitem>
 
@@ -21296,7 +21296,7 @@
         <literal>CREATE</literal>/<literal>ALTER</literal>/<literal>DROP
         DATABASE</literal> statements. In those cases, the database
         being <emphasis>created, altered, or dropped</emphasis> replaces
-        the current database in the rules below.
+        the default database in the rules below.
       </para>
 
       <orderedlist>
@@ -21328,7 +21328,7 @@
           <para>
             There are some rules (<literal>binlog-do-db</literal> or
             <literal>binlog-ignore-db</literal> or both). Is there a
-            current database (has any database been selected by
+            default database (has any database been selected by
             <literal>USE</literal>?)?
           </para>
 
@@ -21352,7 +21352,7 @@
 
         <listitem>
           <para>
-            There is a current database. Are there some
+            There is a default database. Are there some
             <literal>binlog-do-db</literal> rules?
           </para>
 
@@ -21360,7 +21360,7 @@
 
             <listitem>
               <para>
-                Yes: Does the current database match any of the
+                Yes: Does the default database match any of the
                 <literal>binlog-do-db</literal> rules?
               </para>
 
@@ -21394,7 +21394,7 @@
         <listitem>
           <para>
             There are some <literal>binlog-ignore-db</literal> rules.
-            Does the current database match any of the
+            Does the default database match any of the
             <literal>binlog-ignore-db</literal> rules?
           </para>
 
@@ -21420,7 +21420,7 @@
       <para>
         For example, a slave running with only
         <literal>binlog-do-db=sales</literal> does not write to the
-        binary log any statement whose current database is different
+        binary log any statement whose default database is different
         from <literal>sales</literal> (in other words,
         <literal>binlog-do-db</literal> can sometimes mean <quote>ignore
         other databases</quote>).

Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-4.1/language-structure.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -1037,7 +1037,7 @@
 
       <para>
         The syntax <replaceable>.tbl_name</replaceable> means the table
-        <replaceable>tbl_name</replaceable> in the current database.
+        <replaceable>tbl_name</replaceable> in the default database.
         This syntax is accepted for ODBC compatibility because some ODBC
         programs prefix table names with a
         &lsquo;<literal>.</literal>&rsquo; character.

Modified: trunk/refman-4.1/problems.xml
===================================================================
--- trunk/refman-4.1/problems.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-4.1/problems.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -1757,7 +1757,7 @@
 
       <para>
         If you get either of the following errors, it usually means that
-        no table exists in the current database with the given name:
+        no table exists in the default database with the given name:
       </para>
 
 <programlisting>
@@ -1792,7 +1792,7 @@
       </itemizedlist>
 
       <para>
-        You can check which tables are in the current database with
+        You can check which tables are in the default database with
         <literal>SHOW TABLES</literal>. See <xref linkend="show"/>.
       </para>
 

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -1324,8 +1324,8 @@
       <para>
         Rules for allowable table names are given in
         <xref linkend="legal-names"/>. By default, the table is created
-        in the current database. An error occurs if the table exists, if
-        there is no current database, or if the database does not exist.
+        in the default database. An error occurs if the table exists, if
+        there is no default database, or if the database does not exist.
       </para>
 
       <remark role="help-description-end"/>
@@ -1334,7 +1334,7 @@
         In MySQL 3.22 or later, the table name can be specified as
         <replaceable>db_name.tbl_name</replaceable> to create the table
         in a specific database. This works whether or not there is a
-        current database. If you use quoted identifiers, quote the
+        default database. If you use quoted identifiers, quote the
         database and table names separately. For example,
         <literal>`mydb`.`mytbl`</literal> is legal, but
         <literal>`mydb.mytbl`</literal> is not.
@@ -4929,7 +4929,7 @@
         <literal>LOAD DATA</literal> statement reads the file
         <filename>data.txt</filename> from the database directory for
         <literal>db1</literal> because <literal>db1</literal> is the
-        current database, even though the statement explicitly loads the
+        default database, even though the statement explicitly loads the
         file into a table in the <literal>db2</literal> database:
       </para>
 
@@ -6178,7 +6178,7 @@
 
         <listitem>
           <para>
-            You can refer to a table within the current database as
+            You can refer to a table within the default database as
             <replaceable>tbl_name</replaceable> (within the current
             database), or as
             <replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable>

Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-4.1/tutorial.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -2804,7 +2804,7 @@
     </para>
 
     <para>
-      To find out what tables the current database contains (for
+      To find out what tables the default database contains (for
       example, when you are not sure about the name of a table), use
       this command:
     </para>

Modified: trunk/refman-5.0/client-side-scripts.xml
===================================================================
--- trunk/refman-5.0/client-side-scripts.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.0/client-side-scripts.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -2469,7 +2469,7 @@
               </row>
               <row>
                 <entry><literal>\d</literal></entry>
-                <entry>The current database</entry>
+                <entry>The default database</entry>
               </row>
               <row>
                 <entry><literal>\h</literal></entry>
@@ -4827,7 +4827,7 @@
     temporary tables.
 08  LOG_EVENT_SUPPRESS_USE_F
     Set in some circumstances when the event is not dependent on
-    the current database
+    the default database
 </programlisting>
 
             <para>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.0/database-administration.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -14461,7 +14461,7 @@
       <para>
         The <literal>user</literal> table grants privileges that are
         assigned to you on a global basis and that apply no matter what
-        the current database is. For example, if the
+        the default database is. For example, if the
         <literal>user</literal> table grants you the
         <literal>DELETE</literal> privilege, you can delete rows from
         any table in any database on the server host! In other words,
@@ -23193,7 +23193,7 @@
 
           <para>
             Tells the master that it should log updates to the binary
-            log if the current database (that is, the one selected by
+            log if the default database (that is, the one selected by
             <literal>USE</literal>) is
             <replaceable>db_name</replaceable>. All other databases that
             are not explicitly mentioned are ignored. If you use this,
@@ -23226,11 +23226,11 @@
           </para>
 
           <para>
-            Tells the master that updates where the current database
+            Tells the master that updates where the default database
             (that is, the one selected by <literal>USE</literal>) is
             <replaceable>db_name</replaceable> should not be stored in
             the binary log. If you use this, you should ensure that you
-            only do updates in the current database.
+            only do updates in the default database.
           </para>
 
           <para>
@@ -23248,7 +23248,7 @@
             DATABASE</literal>, <literal>ALTER DATABASE</literal>, and
             <literal>DROP DATABASE</literal> statements, which use the
             database manipulated to decide if it should log the
-            statement rather than the current database.
+            statement rather than the default database.
           </para>
         </listitem>
 
@@ -23266,7 +23266,7 @@
         <literal>CREATE</literal>/<literal>ALTER</literal>/<literal>DROP
         DATABASE</literal> statements. In those cases, the database
         being <emphasis>created, altered, or dropped</emphasis> replaces
-        the current database in the rules below.
+        the default database in the rules below.
       </para>
 
       <orderedlist>
@@ -23298,7 +23298,7 @@
           <para>
             There are some rules (<literal>binlog-do-db</literal> or
             <literal>binlog-ignore-db</literal> or both). Is there a
-            current database (has any database been selected by
+            default database (has any database been selected by
             <literal>USE</literal>?)?
           </para>
 
@@ -23322,7 +23322,7 @@
 
         <listitem>
           <para>
-            There is a current database. Are there some
+            There is a default database. Are there some
             <literal>binlog-do-db</literal> rules?
           </para>
 
@@ -23330,7 +23330,7 @@
 
             <listitem>
               <para>
-                Yes: Does the current database match any of the
+                Yes: Does the default database match any of the
                 <literal>binlog-do-db</literal> rules?
               </para>
 
@@ -23364,7 +23364,7 @@
         <listitem>
           <para>
             There are some <literal>binlog-ignore-db</literal> rules.
-            Does the current database match any of the
+            Does the default database match any of the
             <literal>binlog-ignore-db</literal> rules?
           </para>
 
@@ -23390,7 +23390,7 @@
       <para>
         For example, a slave running with only
         <literal>binlog-do-db=sales</literal> does not write to the
-        binary log any statement whose current database is different
+        binary log any statement whose default database is different
         from <literal>sales</literal> (in other words,
         <literal>binlog-do-db</literal> can sometimes mean <quote>ignore
         other databases</quote>).

Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.0/language-structure.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -1021,7 +1021,7 @@
 
       <para>
         The syntax <replaceable>.tbl_name</replaceable> means the table
-        <replaceable>tbl_name</replaceable> in the current database.
+        <replaceable>tbl_name</replaceable> in the default database.
         This syntax is accepted for ODBC compatibility because some ODBC
         programs prefix table names with a
         &lsquo;<literal>.</literal>&rsquo; character.

Modified: trunk/refman-5.0/problems.xml
===================================================================
--- trunk/refman-5.0/problems.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.0/problems.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -1726,7 +1726,7 @@
 
       <para>
         If you get either of the following errors, it usually means that
-        no table exists in the current database with the given name:
+        no table exists in the default database with the given name:
       </para>
 
 <programlisting>
@@ -1761,7 +1761,7 @@
       </itemizedlist>
 
       <para>
-        You can check which tables are in the current database with
+        You can check which tables are in the default database with
         <literal>SHOW TABLES</literal>. See <xref linkend="show"/>.
       </para>
 

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -1338,8 +1338,8 @@
       <para>
         Rules for allowable table names are given in
         <xref linkend="legal-names"/>. By default, the table is created
-        in the current database. An error occurs if the table exists, if
-        there is no current database, or if the database does not exist.
+        in the default database. An error occurs if the table exists, if
+        there is no default database, or if the database does not exist.
       </para>
 
       <remark role="help-description-end"/>
@@ -1348,7 +1348,7 @@
         The table name can be specified as
         <replaceable>db_name.tbl_name</replaceable> to create the table
         in a specific database. This works whether or not there is a
-        current database. If you use quoted identifiers, quote the
+        default database. If you use quoted identifiers, quote the
         database and table names separately. For example,
         <literal>`mydb`.`mytbl`</literal> is legal, but
         <literal>`mydb.mytbl`</literal> is not.
@@ -4921,7 +4921,7 @@
         <literal>LOAD DATA</literal> statement reads the file
         <filename>data.txt</filename> from the database directory for
         <literal>db1</literal> because <literal>db1</literal> is the
-        current database, even though the statement explicitly loads the
+        default database, even though the statement explicitly loads the
         file into a table in the <literal>db2</literal> database:
       </para>
 
@@ -6244,7 +6244,7 @@
 
         <listitem>
           <para>
-            You can refer to a table within the current database as
+            You can refer to a table within the default database as
             <replaceable>tbl_name</replaceable> (within the current
             database), or as
             <replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable>

Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.0/stored-procedures.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -297,7 +297,7 @@
       </para>
 
       <para>
-        By default, the routine is associated with the current database.
+        By default, the routine is associated with the default database.
         To associate the routine explicitly with a given database,
         specify the name as <replaceable>db_name.sp_name</replaceable>
         when you create it.

Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.0/tutorial.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -2791,7 +2791,7 @@
     </para>
 
     <para>
-      To find out what tables the current database contains (for
+      To find out what tables the default database contains (for
       example, when you are not sure about the name of a table), use
       this command:
     </para>

Modified: trunk/refman-5.0/views.xml
===================================================================
--- trunk/refman-5.0/views.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.0/views.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -169,7 +169,7 @@
 
     <para>
       A view belongs to a database. By default, a new view is created in
-      the current database. To create the view explicitly in a given
+      the default database. To create the view explicitly in a given
       database, specify the name as
       <replaceable>db_name.view_name</replaceable> when you create it.
     </para>

Modified: trunk/refman-5.1/client-side-scripts.xml
===================================================================
--- trunk/refman-5.1/client-side-scripts.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.1/client-side-scripts.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -2468,7 +2468,7 @@
               </row>
               <row>
                 <entry><literal>\d</literal></entry>
-                <entry>The current database</entry>
+                <entry>The default database</entry>
               </row>
               <row>
                 <entry><literal>\h</literal></entry>
@@ -4851,7 +4851,7 @@
     temporary tables.
 08  LOG_EVENT_SUPPRESS_USE_F
     Set in some circumstances when the event is not dependent on
-    the current database
+    the default database
 </programlisting>
 
             <para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.1/database-administration.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -14415,7 +14415,7 @@
       <para>
         The <literal>user</literal> table grants privileges that are
         assigned to you on a global basis and that apply no matter what
-        the current database is. For example, if the
+        the default database is. For example, if the
         <literal>user</literal> table grants you the
         <literal>DELETE</literal> privilege, you can delete rows from
         any table in any database on the server host! In other words,
@@ -23138,7 +23138,7 @@
 
           <para>
             Tells the master that it should log updates to the binary
-            log if the current database (that is, the one selected by
+            log if the default database (that is, the one selected by
             <literal>USE</literal>) is
             <replaceable>db_name</replaceable>. All other databases that
             are not explicitly mentioned are ignored. If you use this,
@@ -23171,11 +23171,11 @@
           </para>
 
           <para>
-            Tells the master that updates where the current database
+            Tells the master that updates where the default database
             (that is, the one selected by <literal>USE</literal>) is
             <replaceable>db_name</replaceable> should not be stored in
             the binary log. If you use this, you should ensure that you
-            only do updates in the current database.
+            only do updates in the default database.
           </para>
 
           <para>
@@ -23193,7 +23193,7 @@
             DATABASE</literal>, <literal>ALTER DATABASE</literal>, and
             <literal>DROP DATABASE</literal> statements, which use the
             database manipulated to decide if it should log the
-            statement rather than the current database.
+            statement rather than the default database.
           </para>
         </listitem>
 
@@ -23211,7 +23211,7 @@
         <literal>CREATE</literal>/<literal>ALTER</literal>/<literal>DROP
         DATABASE</literal> statements. In those cases, the database
         being <emphasis>created, altered, or dropped</emphasis> replaces
-        the current database in the rules below.
+        the default database in the rules below.
       </para>
 
       <orderedlist>
@@ -23243,7 +23243,7 @@
           <para>
             There are some rules (<literal>binlog-do-db</literal> or
             <literal>binlog-ignore-db</literal> or both). Is there a
-            current database (has any database been selected by
+            default database (has any database been selected by
             <literal>USE</literal>?)?
           </para>
 
@@ -23267,7 +23267,7 @@
 
         <listitem>
           <para>
-            There is a current database. Are there some
+            There is a default database. Are there some
             <literal>binlog-do-db</literal> rules?
           </para>
 
@@ -23275,7 +23275,7 @@
 
             <listitem>
               <para>
-                Yes: Does the current database match any of the
+                Yes: Does the default database match any of the
                 <literal>binlog-do-db</literal> rules?
               </para>
 
@@ -23309,7 +23309,7 @@
         <listitem>
           <para>
             There are some <literal>binlog-ignore-db</literal> rules.
-            Does the current database match any of the
+            Does the default database match any of the
             <literal>binlog-ignore-db</literal> rules?
           </para>
 
@@ -23335,7 +23335,7 @@
       <para>
         For example, a slave running with only
         <literal>binlog-do-db=sales</literal> does not write to the
-        binary log any statement whose current database is different
+        binary log any statement whose default database is different
         from <literal>sales</literal> (in other words,
         <literal>binlog-do-db</literal> can sometimes mean <quote>ignore
         other databases</quote>).

Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.1/language-structure.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -1021,7 +1021,7 @@
 
       <para>
         The syntax <replaceable>.tbl_name</replaceable> means the table
-        <replaceable>tbl_name</replaceable> in the current database.
+        <replaceable>tbl_name</replaceable> in the default database.
         This syntax is accepted for ODBC compatibility because some ODBC
         programs prefix table names with a
         &lsquo;<literal>.</literal>&rsquo; character.

Modified: trunk/refman-5.1/problems.xml
===================================================================
--- trunk/refman-5.1/problems.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.1/problems.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -1726,7 +1726,7 @@
 
       <para>
         If you get either of the following errors, it usually means that
-        no table exists in the current database with the given name:
+        no table exists in the default database with the given name:
       </para>
 
 <programlisting>
@@ -1761,7 +1761,7 @@
       </itemizedlist>
 
       <para>
-        You can check which tables are in the current database with
+        You can check which tables are in the default database with
         <literal>SHOW TABLES</literal>. See <xref linkend="show"/>.
       </para>
 

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -1606,8 +1606,8 @@
       <para>
         Rules for allowable table names are given in
         <xref linkend="legal-names"/>. By default, the table is created
-        in the current database. An error occurs if the table exists, if
-        there is no current database, or if the database does not exist.
+        in the default database. An error occurs if the table exists, if
+        there is no default database, or if the database does not exist.
       </para>
 
       <remark role="help-description-end"/>
@@ -1616,7 +1616,7 @@
         The table name can be specified as
         <replaceable>db_name.tbl_name</replaceable> to create the table
         in a specific database. This works whether or not there is a
-        current database. If you use quoted identifiers, quote the
+        default database. If you use quoted identifiers, quote the
         database and table names separately. For example,
         <literal>`mydb`.`mytbl`</literal> is legal, but
         <literal>`mydb.mytbl`</literal> is not.
@@ -5505,7 +5505,7 @@
         <literal>LOAD DATA</literal> statement reads the file
         <filename>data.txt</filename> from the database directory for
         <literal>db1</literal> because <literal>db1</literal> is the
-        current database, even though the statement explicitly loads the
+        default database, even though the statement explicitly loads the
         file into a table in the <literal>db2</literal> database:
       </para>
 
@@ -6825,7 +6825,7 @@
 
         <listitem>
           <para>
-            You can refer to a table within the current database as
+            You can refer to a table within the default database as
             <replaceable>tbl_name</replaceable> (within the current
             database), or as
             <replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable>

Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.1/stored-procedures.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -289,7 +289,7 @@
       </para>
 
       <para>
-        By default, the routine is associated with the current database.
+        By default, the routine is associated with the default database.
         To associate the routine explicitly with a given database,
         specify the name as <replaceable>db_name.sp_name</replaceable>
         when you create it.

Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.1/tutorial.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -2785,7 +2785,7 @@
     </para>
 
     <para>
-      To find out what tables the current database contains (for
+      To find out what tables the default database contains (for
       example, when you are not sure about the name of a table), use
       this command:
     </para>

Modified: trunk/refman-5.1/views.xml
===================================================================
--- trunk/refman-5.1/views.xml	2006-01-06 02:19:13 UTC (rev 699)
+++ trunk/refman-5.1/views.xml	2006-01-06 04:01:37 UTC (rev 700)
@@ -160,7 +160,7 @@
 
     <para>
       A view belongs to a database. By default, a new view is created in
-      the current database. To create the view explicitly in a given
+      the default database. To create the view explicitly in a given
       database, specify the name as
       <replaceable>db_name.view_name</replaceable> when you create it.
     </para>

Thread
svn commit - mysqldoc@docsrva: r700 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul6 Jan