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
31a1d668
Commit
31a1d668
authored
20 years ago
by
joreland@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
parents
5ac41f60
48db510b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
Build-tools/Do-compile
Build-tools/Do-compile
+10
-2
strings/uca-dump.c
strings/uca-dump.c
+2
-2
No files found.
Build-tools/Do-compile
View file @
31a1d668
...
@@ -10,7 +10,7 @@ use Sys::Hostname;
...
@@ -10,7 +10,7 @@ use Sys::Hostname;
$opt_distribution
=
$opt_user
=
$opt_config_env
=
$opt_config_extra_env
=
"";
$opt_distribution
=
$opt_user
=
$opt_config_env
=
$opt_config_extra_env
=
"";
$opt_dbd_options
=
$opt_perl_options
=
$opt_config_options
=
$opt_make_options
=
$opt_suffix
=
"";
$opt_dbd_options
=
$opt_perl_options
=
$opt_config_options
=
$opt_make_options
=
$opt_suffix
=
"";
$opt_tmp
=
$opt_version_suffix
=
"";
$opt_tmp
=
$opt_version_suffix
=
"";
$opt_bundled_zlib
=
$opt_help
=
$opt_delete
=
$opt_debug
=
$opt_stage
=
$opt_no_test
=
$opt_no_perl
=
$opt_with_low_memory
=
$opt_fast_benchmark
=
$opt_static_client
=
$opt_static_server
=
$opt_static_perl
=
$opt_sur
=
$opt_with_small_disk
=
$opt_local_perl
=
$opt_tcpip
=
$opt_build_thread
=
$opt_use_old_distribution
=
$opt_enable_shared
=
$opt_no_crash_me
=
$opt_no_strip
=
$opt_with_cluster
=
$opt_with_debug
=
$opt_no_benchmark
=
$opt_no_mysqltest
=
$opt_without_embedded
=
$opt_readline
=
0
;
$opt_bundled_zlib
=
$opt_help
=
$opt_delete
=
$opt_debug
=
$opt_stage
=
$opt_no_test
=
$opt_no_perl
=
$opt_
one_error
=
$opt_
with_low_memory
=
$opt_fast_benchmark
=
$opt_static_client
=
$opt_static_server
=
$opt_static_perl
=
$opt_sur
=
$opt_with_small_disk
=
$opt_local_perl
=
$opt_tcpip
=
$opt_build_thread
=
$opt_use_old_distribution
=
$opt_enable_shared
=
$opt_no_crash_me
=
$opt_no_strip
=
$opt_with_cluster
=
$opt_with_debug
=
$opt_no_benchmark
=
$opt_no_mysqltest
=
$opt_without_embedded
=
$opt_readline
=
0
;
$opt_innodb
=
$opt_bdb
=
$opt_raid
=
$opt_libwrap
=
$opt_clearlogs
=
0
;
$opt_innodb
=
$opt_bdb
=
$opt_raid
=
$opt_libwrap
=
$opt_clearlogs
=
0
;
GetOptions
(
GetOptions
(
...
@@ -37,6 +37,7 @@ GetOptions(
...
@@ -37,6 +37,7 @@ GetOptions(
"
no-test
",
"
no-test
",
"
no-mysqltest
",
"
no-mysqltest
",
"
no-benchmark
",
"
no-benchmark
",
"
one-error
",
"
perl-files=s
",
"
perl-files=s
",
"
perl-options=s
",
"
perl-options=s
",
"
raid
",
"
raid
",
...
@@ -310,6 +311,7 @@ if ($opt_stage <= 2)
...
@@ -310,6 +311,7 @@ if ($opt_stage <= 2)
$command
=
$make
;
$command
=
$make
;
$command
.=
"
$opt_make_options
"
if
(
defined
(
$opt_make_options
)
&&
$opt_make_options
ne
"");
$command
.=
"
$opt_make_options
"
if
(
defined
(
$opt_make_options
)
&&
$opt_make_options
ne
"");
safe_system
(
$command
);
safe_system
(
$command
);
print
LOG
"
Do-compile: Build successful
\n
";
}
}
#
#
...
@@ -372,11 +374,14 @@ $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" .
...
@@ -372,11 +374,14 @@ $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" .
if
(
$opt_stage
<=
5
&&
!
$opt_no_test
&&
!
$opt_no_mysqltest
)
if
(
$opt_stage
<=
5
&&
!
$opt_no_test
&&
!
$opt_no_mysqltest
)
{
{
my
$flags
=
"";
my
$flags
=
"";
my
$force
=
"";
$flags
.=
"
--with-ndbcluster
"
if
(
$opt_with_cluster
);
$flags
.=
"
--with-ndbcluster
"
if
(
$opt_with_cluster
);
$flags
.=
"
--force
"
if
(
!
$opt_one_error
);
log_timestamp
();
log_timestamp
();
system
("
mkdir
$bench_tmpdir
")
if
(
!
-
d
$bench_tmpdir
);
system
("
mkdir
$bench_tmpdir
")
if
(
!
-
d
$bench_tmpdir
);
safe_cd
("
${test_dir}
/mysql-test
");
safe_cd
("
${test_dir}
/mysql-test
");
check_system
("
./mysql-test-run
$flags
--tmpdir=
$bench_tmpdir
--master_port=
$mysql_tcp_port
--slave_port=
$slave_port
--ndbcluster_port=
$ndbcluster_port
--manager-port=
$manager_port
--no-manager --sleep=10
",
"
tests were successful
");
check_system
("
./mysql-test-run
$flags
--tmpdir=
$bench_tmpdir
--master_port=
$mysql_tcp_port
--slave_port=
$slave_port
--ndbcluster_port=
$ndbcluster_port
--manager-port=
$manager_port
--no-manager --sleep=10
",
"
tests were successful
");
# 'mysql-test-run' writes its own final message for log evaluation.
}
}
#
#
...
@@ -555,7 +560,10 @@ Do not run any tests.
...
@@ -555,7 +560,10 @@ Do not run any tests.
Do not run the benchmark test (written in perl)
Do not run the benchmark test (written in perl)
--no-mysqltest
--no-mysqltest
Do not run the the mysql-test-run test (Same as 'make test')
Do not run the mysql-test-run test (Same as 'make test')
--one-error
Terminate the mysql-test-run test after the first difference (default: use '--force')
--no-perl
--no-perl
Do not compile or install Perl modules, use the system installed ones
Do not compile or install Perl modules, use the system installed ones
...
...
This diff is collapsed.
Click to expand it.
strings/uca-dump.c
View file @
31a1d668
...
@@ -269,7 +269,7 @@ int main(int ac, char **av)
...
@@ -269,7 +269,7 @@ int main(int ac, char **av)
*/
*/
int
tmp
=
weight
[
i
];
int
tmp
=
weight
[
i
];
if
(
w
==
2
&&
tmp
)
if
(
w
==
2
&&
tmp
)
tmp
=
(
int
)(
0x
10
0
-
weight
[
i
]);
tmp
=
(
int
)(
0x
2
0
-
weight
[
i
]);
printf
(
"0x%04X"
,
tmp
);
printf
(
"0x%04X"
,
tmp
);
...
@@ -304,7 +304,7 @@ int main(int ac, char **av)
...
@@ -304,7 +304,7 @@ int main(int ac, char **av)
const
char
*
comma
=
page
<
MY_UCA_NPAGES
-
1
?
","
:
""
;
const
char
*
comma
=
page
<
MY_UCA_NPAGES
-
1
?
","
:
""
;
const
char
*
nline
=
(
page
+
1
)
%
4
?
""
:
"
\n
"
;
const
char
*
nline
=
(
page
+
1
)
%
4
?
""
:
"
\n
"
;
if
(
!
pagemaxlen
[
page
])
if
(
!
pagemaxlen
[
page
])
printf
(
"NULL
%s%s"
,
comma
,
nline
);
printf
(
"NULL
%s%s%s"
,
w
?
" "
:
""
,
comma
,
nline
);
else
else
printf
(
"page%03Xdata%s%s%s"
,
page
,
pname
[
w
],
comma
,
nline
);
printf
(
"page%03Xdata%s%s%s"
,
page
,
pname
[
w
],
comma
,
nline
);
}
}
...
...
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