Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
bd247e3d
Commit
bd247e3d
authored
20 years ago
by
ram@gw.mysql.r18.ru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet).
parent
8878c58f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
12 deletions
+28
-12
scripts/fill_help_tables.sh
scripts/fill_help_tables.sh
+8
-4
scripts/mysql_install_db.sh
scripts/mysql_install_db.sh
+1
-1
sql/net_serv.cc
sql/net_serv.cc
+2
-2
sql/sql_parse.cc
sql/sql_parse.cc
+17
-5
No files found.
scripts/fill_help_tables.sh
View file @
bd247e3d
...
@@ -454,10 +454,12 @@ sub print_verbose_errors
...
@@ -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
...
@@ -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
)
;
...
...
This diff is collapsed.
Click to expand it.
scripts/mysql_install_db.sh
View file @
bd247e3d
...
@@ -213,7 +213,7 @@ then
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
sql/net_serv.cc
View file @
bd247e3d
...
@@ -165,7 +165,7 @@ my_bool net_realloc(NET *net, ulong length)
...
@@ -165,7 +165,7 @@ 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 six
e: %lu"
,
DBUG_PRINT
(
"error"
,
(
"Packet too large. Max siz
e: %lu"
,
net
->
max_packet_size
));
net
->
max_packet_size
));
net
->
error
=
1
;
net
->
error
=
1
;
net
->
report_error
=
1
;
net
->
report_error
=
1
;
...
...
This diff is collapsed.
Click to expand it.
sql/sql_parse.cc
View file @
bd247e3d
...
@@ -1102,13 +1102,25 @@ extern "C" pthread_handler_decl(handle_bootstrap,arg)
...
@@ -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
))
{
{
u
int
length
=
(
uint
)
strlen
(
buff
);
u
long
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
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
;
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
--
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment