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
c46e4aca
Commit
c46e4aca
authored
Jun 29, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
parents
0a1381e0
d90a88a5
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
52 additions
and
37 deletions
+52
-37
netware/BUILD/compile-linux-tools
netware/BUILD/compile-linux-tools
+1
-1
netware/BUILD/mwenv
netware/BUILD/mwenv
+1
-1
netware/init_db.sql
netware/init_db.sql
+13
-0
netware/mysql_test_run.c
netware/mysql_test_run.c
+37
-35
No files found.
netware/BUILD/compile-linux-tools
View file @
c46e4aca
...
...
@@ -29,7 +29,7 @@ rm -f */*.linux
./configure
--without-innodb
--without-docs
# build tools only
make clean
config.h
make clean
all-local
(
cd
dbug
;
make libdbug.a
)
(
cd
strings
;
make libmystrings.a
)
(
cd
mysys
;
make libmysys.a
)
...
...
netware/BUILD/mwenv
View file @
c46e4aca
...
...
@@ -13,7 +13,7 @@ export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;
export
WINEPATH
=
"
$MYDEV
/mw/bin"
# the default added path is "$HOME/mydev/mysql-x.x-x/netware/BUILD"
export
PATH
=
"
$PATH
:
/home/kp/mydev
/mysql-VERSION/netware/BUILD"
export
PATH
=
"
$PATH
:
BUILD_DIR
/mysql-VERSION/netware/BUILD"
export
AR
=
'mwldnlm'
export
AR_FLAGS
=
'-type library -o'
...
...
netware/init_db.sql
View file @
c46e4aca
This diff is collapsed.
Click to expand it.
netware/mysql_test_run.c
View file @
c46e4aca
...
...
@@ -24,9 +24,7 @@
#include <ctype.h>
#include <sys/stat.h>
#include <sys/mode.h>
#include "my_manage.h"
/******************************************************************************
macros
...
...
@@ -143,7 +141,7 @@ int read_option(char *, char *);
void
run_test
(
char
*
);
void
setup
(
char
*
);
void
vlog
(
char
*
,
va_list
);
void
log
(
char
*
,
...);
void
log
_msg
(
char
*
,
...);
void
log_info
(
char
*
,
...);
void
log_error
(
char
*
,
...);
void
log_errno
(
char
*
,
...);
...
...
@@ -161,21 +159,21 @@ void report_stats()
{
if
(
total_fail
==
0
)
{
log
(
"
\n
All %d test(s) were successful.
\n
"
,
total_test
);
log
_msg
(
"
\n
All %d test(s) were successful.
\n
"
,
total_test
);
}
else
{
double
percent
=
((
double
)
total_pass
/
total_test
)
*
100
;
log
(
"
\n
Failed %u/%u test(s), %.02f%% successful.
\n
"
,
log
_msg
(
"
\n
Failed %u/%u test(s), %.02f%% successful.
\n
"
,
total_fail
,
total_test
,
percent
);
log
(
"
\n
The .out and .err files in %s may give you some
\n
"
,
result_dir
);
log
(
"hint of what when wrong.
\n
"
);
log
(
"
\n
If you want to report this error, please first read the documentation
\n
"
);
log
(
"at: http://www.mysql.com/doc/M/y/MySQL_test_suite.html
\n
"
);
log
_msg
(
"
\n
The .out and .err files in %s may give you some
\n
"
,
result_dir
);
log
_msg
(
"hint of what when wrong.
\n
"
);
log
_msg
(
"
\n
If you want to report this error, please first read the documentation
\n
"
);
log
_msg
(
"at: http://www.mysql.com/doc/M/y/MySQL_test_suite.html
\n
"
);
}
log
(
"
\n
%.02f total minutes elapsed in the test cases
\n\n
"
,
total_time
/
60
);
log
_msg
(
"
\n
%.02f total minutes elapsed in the test cases
\n\n
"
,
total_time
/
60
);
}
/******************************************************************************
...
...
@@ -240,7 +238,7 @@ void mysql_install_db()
mkdir
(
temp
,
S_IRWXU
);
// create subdirectories
log
(
"Creating test-suite folders...
\n
"
);
log
_msg
(
"Creating test-suite folders...
\n
"
);
snprintf
(
temp
,
PATH_MAX
,
"%s/var/run"
,
mysql_test_dir
);
mkdir
(
temp
,
S_IRWXU
);
snprintf
(
temp
,
PATH_MAX
,
"%s/var/tmp"
,
mysql_test_dir
);
...
...
@@ -259,9 +257,9 @@ void mysql_install_db()
mkdir
(
temp
,
S_IRWXU
);
// install databases
log
(
"Creating test databases for master...
\n
"
);
log
_msg
(
"Creating test databases for master...
\n
"
);
install_db
(
master_dir
);
log
(
"Creating test databases for slave...
\n
"
);
log
_msg
(
"Creating test databases for slave...
\n
"
);
install_db
(
slave_dir
);
}
...
...
@@ -589,15 +587,18 @@ void start_slave()
mysql_tmp_dir
))
==
0
)
{
slave_running
=
TRUE
;
}
else
{
log_error
(
"The slave server went down early."
);
}
}
else
{
log_error
(
"Unable to start slave server."
);
}
// free args
...
...
@@ -805,7 +806,7 @@ void run_test(char *test)
if
(
ignore
)
{
// show test
log
(
"%-46s "
,
test
);
log
_msg
(
"%-46s "
,
test
);
// ignore
rstr
=
TEST_IGNORE
;
...
...
@@ -887,7 +888,7 @@ void run_test(char *test)
sleep
(
1
);
// show test
log
(
"%-46s "
,
test
);
log
_msg
(
"%-46s "
,
test
);
// args
init_args
(
&
al
);
...
...
@@ -959,7 +960,7 @@ void run_test(char *test)
else
// early skips
{
// show test
log
(
"%-46s "
,
test
);
log
_msg
(
"%-46s "
,
test
);
// skip
rstr
=
TEST_SKIP
;
...
...
@@ -967,7 +968,7 @@ void run_test(char *test)
}
// result
log
(
"%10.06f %-14s
\n
"
,
elapsed
,
rstr
);
log
_msg
(
"%10.06f %-14s
\n
"
,
elapsed
,
rstr
);
}
/******************************************************************************
...
...
@@ -996,7 +997,7 @@ void vlog(char *format, va_list ap)
Log the message.
******************************************************************************/
void
log
(
char
*
format
,
...)
void
log
_msg
(
char
*
format
,
...)
{
va_list
ap
;
...
...
@@ -1020,9 +1021,9 @@ void log_info(char *format, ...)
va_start
(
ap
,
format
);
log
(
"-- INFO : "
);
log
_msg
(
"-- INFO : "
);
vlog
(
format
,
ap
);
log
(
"
\n
"
);
log
_msg
(
"
\n
"
);
va_end
(
ap
);
}
...
...
@@ -1040,9 +1041,9 @@ void log_error(char *format, ...)
va_start
(
ap
,
format
);
log
(
"-- ERROR: "
);
log
_msg
(
"-- ERROR: "
);
vlog
(
format
,
ap
);
log
(
"
\n
"
);
log
_msg
(
"
\n
"
);
va_end
(
ap
);
}
...
...
@@ -1060,9 +1061,9 @@ void log_errno(char *format, ...)
va_start
(
ap
,
format
);
log
(
"-- ERROR: (%003u) "
,
errno
);
log
_msg
(
"-- ERROR: (%003u) "
,
errno
);
vlog
(
format
,
ap
);
log
(
"
\n
"
);
log
_msg
(
"
\n
"
);
va_end
(
ap
);
}
...
...
@@ -1157,7 +1158,8 @@ void setup(char *file)
snprintf
(
file_path
,
PATH_MAX
*
2
,
"%s/mysqlbinlog --no-defaults --local-load=%s"
,
bin_dir
,
mysql_tmp_dir
);
setenv
(
"MYSQL_BINLOG"
,
file_path
,
1
);
setenv
(
"MASTER_MYPORT"
,
"9306"
,
1
);
setenv
(
"SLAVE_MYPORT"
,
"9307"
,
1
);
setenv
(
"MYSQL_TCP_PORT"
,
"3306"
,
1
);
}
...
...
@@ -1198,18 +1200,18 @@ int main(int argc, char **argv)
is_ignore_list
=
1
;
}
// header
log
(
"MySQL Server %s, for %s (%s)
\n\n
"
,
VERSION
,
SYSTEM_TYPE
,
MACHINE_TYPE
);
log
_msg
(
"MySQL Server %s, for %s (%s)
\n\n
"
,
VERSION
,
SYSTEM_TYPE
,
MACHINE_TYPE
);
log
(
"Initializing Tests...
\n
"
);
log
_msg
(
"Initializing Tests...
\n
"
);
// install test databases
mysql_install_db
();
log
(
"Starting Tests...
\n
"
);
log
_msg
(
"Starting Tests...
\n
"
);
log
(
"
\n
"
);
log
(
HEADER
);
log
(
DASH
);
log
_msg
(
"
\n
"
);
log
_msg
(
HEADER
);
log
_msg
(
DASH
);
if
(
argc
>
1
+
is_ignore_list
)
{
...
...
@@ -1264,10 +1266,10 @@ int main(int argc, char **argv)
// stop server
mysql_stop
();
log
(
DASH
);
log
(
"
\n
"
);
log
_msg
(
DASH
);
log
_msg
(
"
\n
"
);
log
(
"Ending Tests...
\n
"
);
log
_msg
(
"Ending Tests...
\n
"
);
// report stats
report_stats
();
...
...
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