database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5823


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2004-12-06 20:45:31 +04:00
parent 0d8d061f73 1f1257bd52
commit 678fff408a
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/fill_help_tables.sh
View File

@ -454,10 +454,12 @@ sub print_verbose_errors
print STDERR "number of help keywords - ",$count_keywords,"\n"; print STDERR "number of help keywords - ",$count_keywords,"\n";
my $count_without_help= scalar(@without_help); my $count_without_help= scalar(@without_help);
my $percent_without_help= $count_lex ?
int (($count_without_help/$count_lex)*100) :
"100";
print_bad_names(\@without_help,"lexems without help (". print_bad_names(\@without_help,"lexems without help (".
$count_without_help." ~ ". $count_without_help." ~ ".
(int (($count_without_help/$count_lex)*100)). $percent_without_help."%)");
"%)");
print_bad_names(\@description_with_at, print_bad_names(\@description_with_at,
" topics below have symbol \'@\' in their descriptions.\n". " topics below have symbol \'@\' in their descriptions.\n".
"it's probably the litter from 'texi' tags (script needs fixing)"); "it's probably the litter from 'texi' tags (script needs fixing)");
@ -467,10 +469,12 @@ sub print_verbose_errors
print_bad_names(\@without_description,"topics without description"); print_bad_names(\@without_description,"topics without description");
my $count_without_example= scalar(@without_example); my $count_without_example= scalar(@without_example);
my $percent_without_example= $count_topics ?
int (($count_without_example/$count_topics)*100) :
"100";
print_bad_names(\@without_example,"topics without example (". print_bad_names(\@without_example,"topics without example (".
$count_without_example." ~ ". $count_without_example." ~ ".
(int (($count_without_example/$count_topics)*100)). $percent_without_example."%)");
"%)");
} }
print_verbose_errors if ($verbose_option ne 0); print_verbose_errors if ($verbose_option ne 0);

2
scripts/mysql_install_db.sh
View File

@ -213,7 +213,7 @@ then
fi fi
mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \ mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \
--skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \ --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \
--skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M" --skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M --net_buffer_length=16K"
if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \ if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \
| eval "$mysqld_install_cmd_line" | eval "$mysqld_install_cmd_line"
then then

4
sql/net_serv.cc
View File

@ -165,8 +165,8 @@ my_bool net_realloc(NET *net, ulong length)
if (length >= net->max_packet_size) if (length >= net->max_packet_size)
{ {
DBUG_PRINT("error",("Packet too large. Max sixe: %lu", DBUG_PRINT("error", ("Packet too large. Max size: %lu",
net->max_packet_size)); net->max_packet_size));
net->error= 1; net->error= 1;
net->report_error= 1; net->report_error= 1;
net->last_errno= ER_NET_PACKET_TOO_LARGE; net->last_errno= ER_NET_PACKET_TOO_LARGE;

22
sql/sql_parse.cc
View File

@ -1102,13 +1102,25 @@ extern "C" pthread_handler_decl(handle_bootstrap,arg)
thd->init_for_queries(); thd->init_for_queries();
while (fgets(buff, thd->net.max_packet, file)) while (fgets(buff, thd->net.max_packet, file))
{ {
uint length=(uint) strlen(buff); ulong length= (ulong) strlen(buff);
if (buff[length-1]!='\n' && !feof(file)) while (buff[length-1] != '\n' && !feof(file))
{ {
send_error(thd,ER_NET_PACKET_TOO_LARGE, NullS); /*
thd->fatal_error(); We got only a part of the current string. Will try to increase
break; net buffer then read the rest of the current string.
*/
if (net_realloc(&(thd->net), 2 * thd->net.max_packet))
{
send_error(thd, thd->net.last_errno, NullS);
thd->is_fatal_error= 1;
break;
}
buff= (char*) thd->net.buff;
fgets(buff + length, thd->net.max_packet - length, file);
length+= (ulong) strlen(buff + length);
} }
if (thd->is_fatal_error)
break;
while (length && (my_isspace(thd->charset(), buff[length-1]) || while (length && (my_isspace(thd->charset(), buff[length-1]) ||
buff[length-1] == ';')) buff[length-1] == ';'))
length--; length--;