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
b1db7b12
Commit
b1db7b12
authored
Oct 19, 2012
by
Joerg Bruehe
Browse files
Options
Browse Files
Download
Plain Diff
Automerge into main 5.1
parents
4aaadc12
c0a1b2c8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
3 deletions
+18
-3
scripts/mysql_install_db.pl.in
scripts/mysql_install_db.pl.in
+18
-3
No files found.
scripts/mysql_install_db.pl.in
View file @
b1db7b12
...
...
@@ -423,10 +423,11 @@ my $mysqld_install_cmd_line = quote_options($mysqld_bootstrap,
"
--bootstrap
",
"
--basedir=
$opt
->{basedir}
",
"
--datadir=
$opt
->{ldata}
",
"
--
skip-innodb
",
"
--
skip-b
db
",
"
--skip-ndbcluster
",
"
--
log-warnings=0
",
"
--
loose-skip-inno
db
",
"
--
loose-
skip-ndbcluster
",
"
--max_allowed_packet=8M
",
"
--default-storage-engine=MyISAM
",
"
--net_buffer_length=16K
",
@args
,
);
...
...
@@ -439,6 +440,8 @@ report_verbose_wait($opt,"Installing MySQL system tables...");
open
(
SQL
,
$create_system_tables
)
or
error
(
$opt
,"
can't open
$create_system_tables
for reading: $!
");
open
(
SQL2
,
$fill_system_tables
)
or
error
(
$opt
,"
can't open
$fill_system_tables
for reading: $!
");
# FIXME > /dev/null ?
if
(
open
(
PIPE
,
"
|
$mysqld_install_cmd_line
")
)
{
...
...
@@ -452,8 +455,20 @@ if ( open(PIPE, "| $mysqld_install_cmd_line") )
print
PIPE
$_
;
}
while
(
<
SQL2
>
)
{
# TODO: make it similar to the above condition when we're sure
# @@hostname returns a fqdn
# When doing a "cross bootstrap" install, no reference to the current
# host should be added to the system tables. So we filter out any
# lines which contain the current host name.
next
if
/\@current_hostname/
;
print
PIPE
$_
;
}
close
PIPE
;
close
SQL
;
close
SQL2
;
report_verbose
(
$opt
,"
OK
");
...
...
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