svn commit - mysqldoc@docsrva: r10316 - in trunk: . dynamic-docs/changelog

[paul]

Author: paul
Date: 2008-03-19 17:38:30 +0100 (Wed, 19 Mar 2008)
New Revision: 10316

Log:
 r30157@frost:  paul | 2008-03-19 11:29:38 -0500
 Fix bad merge


Modified:
   trunk/dynamic-docs/changelog/mysqld-1.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30151
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30322
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30157
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30322


Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml	2008-03-19 16:22:22 UTC (rev 10315)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml	2008-03-19 16:38:30 UTC (rev 10316)
Changed blocks: 1, Lines Added: 24, Lines Deleted: 0; 835 bytes

@@ -11904,4 +11904,28 @@
 
   </logentry>
 
+  <logentry entrytype="feature">
+
+    <tags>
+      <manual type="mysql_tableinfo"/>
+      <manual type="INFORMATION_SCHEMA"/>
+    </tags>
+
+    <versions>
+      <version ver="5.1.0"/>
+    </versions>
+
+    <message>
+
+      <para>
+        The <command>mysql_tableinfo</command> script has been removed.
+        Information similar to that produced by this script is available
+        from tables in the <literal>INFORMATION_SCHEMA</literal>
+        database.
+      </para>
+
+    </message>
+
+  </logentry>
+
 </changelog>