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
9f277e55
Commit
9f277e55
authored
Aug 18, 2008
by
Chad MILLER
Browse files
Options
Browse Files
Download
Plain Diff
Merge from 5.0-bugteam local.
parents
21598ea0
ff577e35
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
10 deletions
+24
-10
netware/BUILD/compile-linux-tools
netware/BUILD/compile-linux-tools
+3
-0
netware/BUILD/nwbootstrap
netware/BUILD/nwbootstrap
+5
-3
netware/Makefile.am
netware/Makefile.am
+1
-2
netware/mysql_install_db.c
netware/mysql_install_db.c
+15
-5
No files found.
netware/BUILD/compile-linux-tools
View file @
9f277e55
...
...
@@ -53,6 +53,9 @@ make
# so the file will be linked
(
cd
sql
;
make sql_yacc.cc
)
# we need initilizing SQL files.
(
cd
netware
;
make test_db.sql init_db.sql
)
# copying required linux tools
cp
extra/comp_err extra/comp_err.linux
cp
libmysql/conf_to_src libmysql/conf_to_src.linux
...
...
netware/BUILD/nwbootstrap
View file @
9f277e55
...
...
@@ -91,8 +91,8 @@ done
echo
"starting build..."
# check for bk and repo_dir
b
k
help
>
/dev/null
repo_dir
=
`
b
k
root
$repo_dir
`
b
zr
help
>
/dev/null
repo_dir
=
`
b
zr
root
$repo_dir
`
cd
$repo_dir
doc_dir
=
"
$repo_dir
/../mysqldoc"
...
...
@@ -100,7 +100,7 @@ doc_dir="$repo_dir/../mysqldoc"
temp_dir
=
"
$build_dir
/mysql-
$$
.tmp"
# export the bk tree
command
=
"b
k
export"
;
command
=
"b
zr
export"
;
if
test
$revision
;
then
command
=
"
$command
-r
$revision
"
;
fi
command
=
"
$command
$temp_dir
"
echo
"exporting
$repo_dir
..."
...
...
@@ -178,6 +178,8 @@ awk 'BEGIN{x=0;} END{printf("\n");} x==1 {printf(" %s",$1); x++; next} x>1 {pri
# build linux tools
echo
"compiling linux tools..."
./netware/BUILD/compile-linux-tools
test
-f
./netware/init_db.sql
# this must exist
test
-f
./netware/test_db.sql
# this must exist
# compile
if
test
$build
...
...
netware/Makefile.am
View file @
9f277e55
...
...
@@ -103,8 +103,7 @@ init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \
@
echo
"CREATE DATABASE mysql;"
>
$@
;
@
echo
"CREATE DATABASE test;"
>>
$@
;
@
echo
"use mysql;"
>>
$@
;
@
cat
$(top_srcdir)
/scripts/mysql_system_tables.sql
\
$(top_srcdir)
/scripts/mysql_system_tables_fix.sql
>>
$@
;
@
cat
$(top_srcdir)
/scripts/mysql_system_tables.sql
>>
$@
;
# Build test_db.sql from init_db.sql plus
# some test data
...
...
netware/mysql_install_db.c
View file @
9f277e55
...
...
@@ -324,9 +324,10 @@ void create_paths()
******************************************************************************/
int
mysql_install_db
(
int
argc
,
char
*
argv
[])
{
arg_list_t
al
;
int
i
,
j
,
err
;
char
skip
;
arg_list_t
al
;
int
i
,
j
,
err
;
char
skip
;
struct
stat
info
;
// private options
static
char
*
private_options
[]
=
...
...
@@ -363,6 +364,15 @@ int mysql_install_db(int argc, char *argv[])
add_arg
(
&
al
,
"--skip-innodb"
);
add_arg
(
&
al
,
"--skip-bdb"
);
if
((
err
=
stat
(
sql_file
,
&
info
))
!=
0
)
{
printf
(
"ERROR - %s:
\n
"
,
strerror
(
errno
));
printf
(
"
\t
%s
\n\n
"
,
sql_file
);
// free args
free_args
(
&
al
);
exit
(
-
1
);
}
// spawn mysqld
err
=
spawn
(
mysqld
,
&
al
,
TRUE
,
sql_file
,
out_log
,
err_log
);
...
...
@@ -395,9 +405,9 @@ int main(int argc, char **argv)
// install the database
if
(
mysql_install_db
(
argc
,
argv
))
{
printf
(
"ERROR -
The database creation failed
!
\n
"
);
printf
(
"ERROR -
Failed to create the database
!
\n
"
);
printf
(
" %s
\n
"
,
strerror
(
errno
));
printf
(
"See the following log for more info
mr
ation:
\n
"
);
printf
(
"See the following log for more info
rm
ation:
\n
"
);
printf
(
"
\t
%s
\n\n
"
,
err_log
);
exit
(
-
1
);
}
...
...
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