database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

- reverted change to fill_help_tables.sh ("Added checking of maximum

Browse Source 
length of line in output (Bug #2874)" from last ChangeSet (should not
   have been applied)
This commit is contained in:
lenz@mysql.com
2004-04-30 14:31:52 +02:00
parent 661aeb5af2
commit 3856bdfb82
1 changed files with 7 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
scripts/fill_help_tables.sh
View File

@ -45,7 +45,6 @@ use strict;
use Getopt::Long; use Getopt::Long;
my $insert_portion_size= 15; my $insert_portion_size= 15;
my $maximum_line_length= 2040;
my $error_prefix= "---- help parsing errors :"; my $error_prefix= "---- help parsing errors :";
my $path_to_lex_file= "../sql/lex.h"; my $path_to_lex_file= "../sql/lex.h";
@ -167,7 +166,6 @@ sub add_description
print_error "double description for $topic_name\n"; print_error "double description for $topic_name\n";
} }
$topics{$topic_name}->{description}= $description; $topics{$topic_name}->{description}= $description;
$topics{$topic_name}->{line_of_description}= $cur_line;
add_topic_to_category($topic_name); add_topic_to_category($topic_name);
} }
@ -517,52 +515,21 @@ if (scalar(@topic_names))
{ {
my $header= "insert into help_topic ". my $header= "insert into help_topic ".
"(help_topic_id,help_category_id,name,description,example) values "; "(help_topic_id,help_category_id,name,description,example) values ";
my $line_accumulator= $header;
my $lines_in_accumulator= 0;
my $actual_max_line_length= $maximum_line_length-2; # for ";\n"
my $topic_name; my $topic_name;
my $count= 0; my $count= 0;
foreach $topic_name (@topic_names) foreach $topic_name (@topic_names)
{ {
print_insert_header($count,$header);
my $topic= $topics{$topic_name}; my $topic= $topics{$topic_name};
my $line= "($count,"; print "($count,";
$line.= "$topic->{category}->{__id__},"; print "$topic->{category}->{__id__},";
$line.= "\"$topic_name\","; print "\"$topic_name\",";
$line.= "\"$topic->{description}\","; print "\"$topic->{description}\",";
$line.= "\"$topic->{example}\")"; print "\"$topic->{example}\")";
if ($lines_in_accumulator <= $insert_portion_size &&
length($line) + length($line_accumulator) < $actual_max_line_length)
{
if ($lines_in_accumulator ne 0)
{
$line_accumulator.= ",";
}
$line_accumulator.= $line;
$lines_in_accumulator++;
}
else
{
if (length($line) + length($header) >= $actual_max_line_length)
{
$cur_line= $topics{$topic_name}->{line_of_description};
print_error "too long record for topic \"$topic_name\" \n".
" please decrease its description or example!\n";
}
else
{
print "$line_accumulator;\n";
$line_accumulator= $header.$line;
$lines_in_accumulator= 1;
}
}
$topics{$topic_name}->{__id__}= $count; $topics{$topic_name}->{__id__}= $count;
$count++; $count++;
} }
if ($lines_in_accumulator ne 0) printf ";\n\n";
{
print "$line_accumulator;\n";
}
printf "\n";
} }
my @keywords_names= keys(%keywords); my @keywords_names= keys(%keywords);