svn commit - mysqldoc@docsrva: r2423 - in trunk: . tools

[paul]

Author: paul
Date: 2006-06-19 20:02:36 +0200 (Mon, 19 Jun 2006)
New Revision: 2423

Log:
 r11435@frost:  paul | 2006-06-19 13:02:14 -0500
 fill_help_tables.sql didn't load in ANSI mode. (Bug#20542)


Modified:
   trunk/
   trunk/tools/fill_help_tables2.pl


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10577
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:11433
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7663
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10577
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:11435
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7663

Modified: trunk/tools/fill_help_tables2.pl
===================================================================
--- trunk/tools/fill_help_tables2.pl	2006-06-19 17:56:17 UTC (rev 2422)
+++ trunk/tools/fill_help_tables2.pl	2006-06-19 18:02:36 UTC (rev 2423)
@@ -381,7 +381,7 @@
     my $parent_cat_name= $categories{$cat_name}->{__parent_category__};
     my $parent_cat_id= $parent_cat_name eq "" 
         ? "0" : $categories{$parent_cat_name}->{__id__};
-    print "$header(", $count+1, ",\"$cat_name\",$parent_cat_id,'');\n";
+    print "$header(", $count+1, ",'$cat_name',$parent_cat_id,'');\n";
     $count++;
   }
   printf "\n";
@@ -404,10 +404,10 @@
 
     print "$header($count,";
     print "$topic->{category}->{__id__},";
-    print "\"$topic_name\",";
-    print "\"$topic->{description}\",";
-    print "\"$topic->{example}\",";
-    print "\"$topic->{url}\");\n";
+    print "'$topic_name',";
+    print "'$topic->{description}',";
+    print "'$topic->{example}',";
+    print "'$topic->{url}');\n";
     $topics{$topic_name}->{__id__}= $count;
     $count++;
   }
@@ -422,7 +422,7 @@
   my $count= 0;
   foreach $keyword_name (@keywords_names)
   {
-    print "$header($count,\"$keyword_name\");\n";
+    print "$header($count,\'$keyword_name\');\n";
     $count++;
   }
   printf "\n";
@@ -730,7 +730,7 @@
   warn "$.:Analyzed text:\n---\n",  join ("\n", @result), "---\n" if $debug;
   my $result = join ("\n", @result);
   $result =~ s/\\/\\\\/g;
-  $result =~ s/"/\\"/g;
+  $result =~ s/'/\\'/g;
   return $result;
 }