List:Commits« Previous MessageNext Message »
From:paul.dubois Date:October 28 2010 5:06pm
Subject:svn commit - mysqldoc@docsrva: r23449 - in trunk: . mysql-enterprise-backup-3.5 refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0
View as plain text  
Author: paul
Date: 2010-10-28 19:06:46 +0200 (Thu, 28 Oct 2010)
New Revision: 23449

Log:
 r64841@frost:  paul | 2010-10-28 12:04:24 -0500
 After merge fix


Removed:
   trunk/mysql-enterprise-backup-3.5/manual-raw.html
Renamed/Moved:
   trunk/mysql-enterprise-backup-3.5/manual-raw.htmlsave (from rev 21445, trunk/mysql-enterprise-backup-3.5/manual-raw.html)
Modified:
   trunk/refman-4.1/dba-privilege-system.xml
   trunk/refman-5.0/dba-privilege-system.xml
   trunk/refman-5.1/dba-privilege-system.xml
   trunk/refman-5.5/dba-privilege-system.xml
   trunk/refman-5.6/dba-privilege-system.xml
   trunk/refman-6.0/dba-privilege-system.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43731
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:64832
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43731
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:64841
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546


Modified: trunk/refman-4.1/dba-privilege-system.xml
===================================================================
--- trunk/refman-4.1/dba-privilege-system.xml	2010-10-28 16:59:34 UTC (rev 23448)
+++ trunk/refman-4.1/dba-privilege-system.xml	2010-10-28 17:06:46 UTC (rev 23449)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 40; 1118 bytes

@@ -786,46 +786,6 @@
       server uses their contents when interacting with clients.
     </para>
 
-<para>
-These <literal>mysql</literal> database tables contain grant information:
-</para>
-
-<itemizedlist>
-<listitem>
-<para>
-<literal>user</literal>: Contains user accounts, global privileges, and other
-non-privilege columns.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>db</literal>: Contains database-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>host</literal>: Obsolete.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>tables_priv</literal>:
-Contains table-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>columns_priv</literal>:
-Contains column-level privileges.
-</para>
-</listitem>
-
-</itemizedlist>
-
     <para>
       These <literal>mysql</literal> database tables contain grant
       information:


Modified: trunk/refman-5.0/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.0/dba-privilege-system.xml	2010-10-28 16:59:34 UTC (rev 23448)
+++ trunk/refman-5.0/dba-privilege-system.xml	2010-10-28 17:06:46 UTC (rev 23449)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 46; 1223 bytes

@@ -861,52 +861,6 @@
       server uses their contents when interacting with clients.
     </para>
 
-<para>
-These <literal>mysql</literal> database tables contain grant information:
-</para>
-
-<itemizedlist>
-<listitem>
-<para>
-<literal>user</literal>: Contains user accounts, global privileges, and other
-non-privilege columns.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>db</literal>: Contains database-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>host</literal>: Obsolete.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>tables_priv</literal>:
-Contains table-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>columns_priv</literal>:
-Contains column-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>procs_priv</literal>:
-Contains stored-routine privileges.
-</para>
-</listitem>
-</itemizedlist>
-
     <para>
       These <literal>mysql</literal> database tables contain grant
       information:


Modified: trunk/refman-5.1/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.1/dba-privilege-system.xml	2010-10-28 16:59:34 UTC (rev 23448)
+++ trunk/refman-5.1/dba-privilege-system.xml	2010-10-28 17:06:46 UTC (rev 23449)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 46; 1223 bytes

@@ -895,52 +895,6 @@
       server uses their contents when interacting with clients.
     </para>
 
-<para>
-These <literal>mysql</literal> database tables contain grant information:
-</para>
-
-<itemizedlist>
-<listitem>
-<para>
-<literal>user</literal>: Contains user accounts, global privileges, and other
-non-privilege columns.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>db</literal>: Contains database-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>host</literal>: Obsolete.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>tables_priv</literal>:
-Contains table-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>columns_priv</literal>:
-Contains column-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>procs_priv</literal>:
-Contains stored-routine privileges.
-</para>
-</listitem>
-</itemizedlist>
-
     <para>
       These <literal>mysql</literal> database tables contain grant
       information:


Modified: trunk/refman-5.5/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.5/dba-privilege-system.xml	2010-10-28 16:59:34 UTC (rev 23448)
+++ trunk/refman-5.5/dba-privilege-system.xml	2010-10-28 17:06:46 UTC (rev 23449)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 46; 1223 bytes

@@ -900,52 +900,6 @@
       server uses their contents when interacting with clients.
     </para>
 
-<para>
-These <literal>mysql</literal> database tables contain grant information:
-</para>
-
-<itemizedlist>
-<listitem>
-<para>
-<literal>user</literal>: Contains user accounts, global privileges, and other
-non-privilege columns.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>db</literal>: Contains database-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>host</literal>: Obsolete.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>tables_priv</literal>:
-Contains table-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>columns_priv</literal>:
-Contains column-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>procs_priv</literal>:
-Contains stored-routine privileges.
-</para>
-</listitem>
-</itemizedlist>
-
     <para>
       These <literal>mysql</literal> database tables contain grant
       information:


Modified: trunk/refman-5.6/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.6/dba-privilege-system.xml	2010-10-28 16:59:34 UTC (rev 23448)
+++ trunk/refman-5.6/dba-privilege-system.xml	2010-10-28 17:06:46 UTC (rev 23449)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 46; 1223 bytes

@@ -900,52 +900,6 @@
       server uses their contents when interacting with clients.
     </para>
 
-<para>
-These <literal>mysql</literal> database tables contain grant information:
-</para>
-
-<itemizedlist>
-<listitem>
-<para>
-<literal>user</literal>: Contains user accounts, global privileges, and other
-non-privilege columns.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>db</literal>: Contains database-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>host</literal>: Obsolete.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>tables_priv</literal>:
-Contains table-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>columns_priv</literal>:
-Contains column-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>procs_priv</literal>:
-Contains stored-routine privileges.
-</para>
-</listitem>
-</itemizedlist>
-
     <para>
       These <literal>mysql</literal> database tables contain grant
       information:


Modified: trunk/refman-6.0/dba-privilege-system.xml
===================================================================
--- trunk/refman-6.0/dba-privilege-system.xml	2010-10-28 16:59:34 UTC (rev 23448)
+++ trunk/refman-6.0/dba-privilege-system.xml	2010-10-28 17:06:46 UTC (rev 23449)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 46; 1223 bytes

@@ -900,52 +900,6 @@
       server uses their contents when interacting with clients.
     </para>
 
-<para>
-These <literal>mysql</literal> database tables contain grant information:
-</para>
-
-<itemizedlist>
-<listitem>
-<para>
-<literal>user</literal>: Contains user accounts, global privileges, and other
-non-privilege columns.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>db</literal>: Contains database-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>host</literal>: Obsolete.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>tables_priv</literal>:
-Contains table-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>columns_priv</literal>:
-Contains column-level privileges.
-</para>
-</listitem>
-
-<listitem>
-<para>
-<literal>procs_priv</literal>:
-Contains stored-routine privileges.
-</para>
-</listitem>
-</itemizedlist>
-
     <para>
       These <literal>mysql</literal> database tables contain grant
       information:


Thread
svn commit - mysqldoc@docsrva: r23449 - in trunk: . mysql-enterprise-backup-3.5 refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0paul.dubois28 Oct