svn commit - mysqldoc@docsrva: r1416 - in trunk: . refman-5.1 tools

[paul]

Author: paul
Date: 2006-02-21 16:02:35 +0100 (Tue, 21 Feb 2006)
New Revision: 1416

Log:
 r3463@kite-hub:  paul | 2006-02-21 08:59:43 -0600
 Fix parsing problem in error-message extractor.
 Update error messages.
 Delete vestigial symlink.


Removed:
   trunk/tools/mhp
Modified:
   trunk/
   trunk/refman-5.1/errmsgs-server.xml
   trunk/tools/make-errmsgs-server.pl


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

Modified: trunk/refman-5.1/errmsgs-server.xml
===================================================================
--- trunk/refman-5.1/errmsgs-server.xml	2006-02-21 15:02:22 UTC (rev 1415)
+++ trunk/refman-5.1/errmsgs-server.xml	2006-02-21 15:02:35 UTC (rev 1416)
@@ -6107,7 +6107,8 @@
     </para>
 
     <para>
-      Message: Table upgrade required. Please do \
+      Message: Table upgrade required. Please do "REPAIR TABLE `%s`" to
+      fix it!
     </para>
   </listitem>
 
@@ -6135,5 +6136,17 @@
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      Error: <literal>1540</literal> SQLSTATE:
<literal>HY000</literal>
+      (<literal>ER_WARN_DEPRECATED_STATEMENT</literal>)
+    </para>
+
+    <para>
+      Message: The '%s' statement is deprecated and will be removed in
+      MySQL %s. Please use client programs (e.g. %s) instead.
+    </para>
+  </listitem>
+
 </itemizedlist>
 <!-- END_OF_SERVER_ERROR_INFO -->

Modified: trunk/tools/make-errmsgs-server.pl
===================================================================
--- trunk/tools/make-errmsgs-server.pl	2006-02-21 15:02:22 UTC (rev 1415)
+++ trunk/tools/make-errmsgs-server.pl	2006-02-21 15:02:35 UTC (rev 1416)
@@ -242,7 +242,8 @@
       $info_hr->{errmsg} = {};
       push @msginfo, $info_hr;
     }
-    elsif (/^\s+(\S+)\s+"([^"]+)"/)
+    #elsif (/^\s+(\S+)\s+"([^"]+)"/)
+    elsif (/^\s+(\S+)\s+"(.*)",?\s*$/)
     {
       # Format of line: (spaces)langcode "error-message"
       die "$.:No error symbol preceding langcode/errmsg line\n"
@@ -377,6 +378,7 @@
 
 # Clean up an error message string:
 # - Map sequences like %-64s to simple %s sequences.
+# - Convert \" to "
 # - Strip literal "\n" if it appears at end of message, convert to a
 #   single space otherwise.
 
@@ -386,6 +388,7 @@
 
   warn "$.:msg (before cleaning): ($msg)\n" if $debug;
   $msg =~s/%[-.0-9]+s/%s/g;
+  $msg =~ s/\\"/"/g;
   $msg =~ s/\\n$//;
   $msg =~ s/\\n/ /g;
   warn "$.:msg (after cleaning): ($msg)\n" if $debug;

Deleted: trunk/tools/mhp