diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-12-06 18:45:41 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-12-06 18:45:41 +0400 |
| commit | 1f1257bd52b7b040df3d8d3842401a885ab8b965 (patch) | |
| tree | bd2e97fceacc8a15036a565ec538d5b2282853aa /scripts | |
| parent | 21f2d3aa3fac1fa864b9a32d0848a22931b7ec61 (diff) | |
| download | mariadb-git-1f1257bd52b7b040df3d8d3842401a885ab8b965.tar.gz | |
A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet).
scripts/fill_help_tables.sh:
percent_xxx variables added to avoid /0 error.
scripts/mysql_install_db.sh:
A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet).
--net_buffer_length=16K added.
sql/net_serv.cc:
Typo fixed.
sql/sql_parse.cc:
A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet).
Auto extend net buffer in bootstrap mode.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fill_help_tables.sh | 12 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/scripts/fill_help_tables.sh b/scripts/fill_help_tables.sh index 78dfe7b6088..51edfc8af78 100644 --- a/scripts/fill_help_tables.sh +++ b/scripts/fill_help_tables.sh @@ -454,10 +454,12 @@ sub print_verbose_errors print STDERR "number of help keywords - ",$count_keywords,"\n"; 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 (". $count_without_help." ~ ". - (int (($count_without_help/$count_lex)*100)). - "%)"); + $percent_without_help."%)"); print_bad_names(\@description_with_at, " topics below have symbol \'@\' in their descriptions.\n". "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"); 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 (". $count_without_example." ~ ". - (int (($count_without_example/$count_topics)*100)). - "%)"); + $percent_without_example."%)"); } print_verbose_errors if ($verbose_option ne 0); diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index b4f59790e73..8b2e42bd8cd 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -213,7 +213,7 @@ then fi mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \ --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 \ | eval "$mysqld_install_cmd_line" then |