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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
bc56e326
Commit
bc56e326
authored
Jan 21, 2001
by
monty@work.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates from 3.23.30
parent
1b72f32c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
19 deletions
+36
-19
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
Build-tools/Do-compile
Build-tools/Do-compile
+31
-15
Build-tools/Do-patch-file
Build-tools/Do-patch-file
+2
-2
Build-tools/Do-rpm
Build-tools/Do-rpm
+2
-2
No files found.
BitKeeper/etc/logging_ok
View file @
bc56e326
...
...
@@ -6,3 +6,4 @@ sasha@mysql.sashanet.com
sasha@work.mysql.com
serg@donna.mysql.com
tim@cane.mysql.fi
monty@work.mysql.com
Build-tools/Do-compile
View file @
bc56e326
...
...
@@ -2,25 +2,26 @@
use
Getopt::
Long
;
$opt_distribution
=
$opt_user
=
$opt_result
=
$opt_config_options
=
$opt_config_env
=
"";
$opt_dbd_options
=
$opt_perl_options
=
"";
$opt_dbd_options
=
$opt_perl_options
=
$opt_suffix
=
"";
$opt_tmp
=
"";
$opt_help
=
$opt_Information
=
$opt_no_delete
=
$opt_debug
=
$opt_stage
=
$opt_rsh_mail
=
$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
=
0
;
GetOptions
("
Information
","
help
","
distribution=s
","
user=s
","
result=s
","
no-delete
","
no-test
","
perl-files=s
","
debug
","
config-options=s
","
config-env=s
","
stage=i
","
rsh-mail
","
with-low-memory
","
fast-benchmark
","
tmp=s
","
static-client
","
static-server
","
static-perl
","
no-perl
","
local-perl
","
perl-options=s
","
sur
","
with-small-disk
","
dbd-options=s
","
tcpip
")
||
usage
();
$opt_help
=
$opt_Information
=
$opt_no_delete
=
$opt_debug
=
$opt_stage
=
$opt_rsh_mail
=
$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_no_mysqltest
=
0
;
GetOptions
("
Information
","
help
","
distribution=s
","
user=s
","
result=s
","
no-delete
","
no-test
","
no-mysqltest
","
perl-files=s
","
debug
","
config-options=s
","
config-env=s
","
stage=i
","
rsh-mail
","
with-low-memory
","
fast-benchmark
","
tmp=s
","
static-client
","
static-server
","
static-perl
","
no-perl
","
local-perl
","
perl-options=s
","
sur
","
with-small-disk
","
dbd-options=s
","
tcpip
","
suffix=s
","
build-thread=i
")
||
usage
();
usage
()
if
(
$opt_help
||
$opt_Information
);
usage
()
if
(
!
$opt_distribution
);
chomp
(
$host
=
`
hostname
`);
print
"
$host
: Compiling MySQL at
$host
, stage:
$opt_stage
\n
"
if
(
$opt_debug
);
$full_host_name
=
$host
;
print
"
$host
: Compiling MySQL at
$host$suffix
, stage:
$opt_stage
\n
"
if
(
$opt_debug
);
$connect_option
=
(
$opt_tcpip
?
"
--host=
$host
"
:
"");
$host
=~
/^([^.-]*)/
;
$host
=
$1
;
$host
=
$1
.
$opt_suffix
;
$email
=
"
$opt_user
\
@mysql
.com
";
$pwd
=
`
pwd
`;
chomp
(
$pwd
);
$log
=
"
$pwd
/Logs/
$host
.log
";
$opt_distribution
=~
/(mysql-[^\/]*)\.tar/
;
$ver
=
$1
;
$gcc_version
=
which
("
gcc
");
$connect_option
=
(
$opt_tcpip
?
"
--host=
$host
"
:
"");
if
(
defined
(
$gcc_version
)
&&
!
$opt_config_env
)
{
$tmp
=
`
$gcc_version
-v 2>&1
`;
...
...
@@ -33,14 +34,22 @@ if (defined($gcc_version) && ! $opt_config_env)
$opt_config_env
=
'
CC=gcc CFLAGS="-O3 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O3 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti"
';
}
}
$new_opt_tmp
=
0
;
if
(
$opt_tmp
)
{
if
(
!
-
d
$opt_tmp
)
{
safe_system
("
mkdir
$opt_tmp
");
$new_opt_tmp
=
1
;
}
$ENV
{'
TMPDIR
'}
=
$opt_tmp
;
}
else
{
$opt_tmp
=
"
/tmp
";
}
$bench_tmpdir
=
"
$opt_tmp
/my_build-
$host
";
$ENV
{'
PATH
'}
=
"
$pwd
/
$host
/bin:
"
.
$ENV
{'
PATH
'};
$rsh
=
which
("
rcmd
","
rsh
");
$make
=
which
("
gmake
","
make
");
# Can't use -j here!
...
...
@@ -49,8 +58,8 @@ $sendmail=find("/usr/lib/sendmail","/usr/sbin/sendmail");
$sur
=
$opt_sur
?
"
/my/local/bin/sur
"
:
"";
delete
$ENV
{'
MYSQL_PWD
'};
# Reset possibly password
delete
$ENV
{'
MY_BASEDIR_VERSION
'};
$ENV
{'
MYSQL_TCP_PORT
'}
=
"
3334
"
;
$ENV
{'
MYSQL_UNIX_PORT
'}
=
$mysql_unix_port
=
"
$opt_tmp
/mysql.build
";
$ENV
{'
MYSQL_TCP_PORT
'}
=
$mysql_tcp_port
=
3334
+
$opt_build_thread
;
$ENV
{'
MYSQL_UNIX_PORT
'}
=
$mysql_unix_port
=
"
$opt_tmp
/mysql
$opt_suffix
.build
";
$ENV
{"
PERL5LIB
"}
=
"
$pwd
/
$host
/perl5:
$pwd
/
$host
/perl5/site_perl
";
if
(
$opt_stage
==
0
)
...
...
@@ -61,6 +70,7 @@ if ($opt_stage == 0)
log_system
("
$host
/bin/mysqladmin --no-defaults -u root -S
$mysql_unix_port
-s shutdown
");
}
system
("
mkdir
$host
")
if
(
!
-
d
$host
);
system
("
mkdir
$bench_tmpdir
")
if
(
!
-
d
$bench_tmpdir
);
system
("
touch
$host
/mysql-fix-for-glob
");
rm_all
(
<
$host
/
mysql
-*>
);
rm_all
("
$host
/test
");
...
...
@@ -114,9 +124,10 @@ if ($opt_stage <= 2)
#
if
(
$opt_stage
<=
3
)
{
log_system
("
rm -fr mysql-*
$pwd
/
$host
/*.tar.gz
");
log_system
("
rm -fr mysql-3* mysql-4*
$pwd
/
$host
/*.tar.gz
");
log_system
("
nm -n sql/mysqld | gzip -9 -v 2>&1 > sql/mysqld.sym.gz | cat
");
log_system
("
strip sql/mysqld extra/comp_err client/mysql sql/mysqld client/mysqlshow extra/replace isam/isamchk client/mysqladmin client/mysqldump extra/perror
");
check_system
("
scripts/make_binary_distribution
$opt_tmp
","
.tar.gz created
");
check_system
("
scripts/make_binary_distribution
$opt_tmp
$opt_suffix
","
.tar.gz created
");
safe_system
("
mv mysql*.tar.gz
$pwd
/
$host
");
safe_system
("
cp client/mysqladmin
$pwd
/
$host
/bin
");
safe_system
("
$make
clean
")
if
(
$opt_with_small_disk
);
...
...
@@ -140,10 +151,12 @@ if ($opt_stage <= 4 && !$opt_no_test)
$test_dir
=<
$pwd
/$host/
test
/
$ver
-*>
;
if
(
$opt_stage
<=
5
&&
!
$opt_no_test
)
if
(
$opt_stage
<=
5
&&
!
$opt_no_test
&&
!
$opt_no_mysqltest
)
{
safe_cd
("
$test_dir
/mysql-test
");
check_system
("
./mysql-test-run
",
"
tests were successful
");
my
(
$slave_port
);
$slave_port
=
$mysql_tcp_port
+
16
;
safe_cd
("
${test_dir}
/mysql-test
");
check_system
("
./mysql-test-run --tmpdir=
$bench_tmpdir
--master_port=
$mysql_tcp_port
--slave_port=
$slave_port
--sleep=10
",
"
tests were successful
");
}
if
(
$opt_stage
<=
6
&&
!
$opt_no_test
)
...
...
@@ -210,7 +223,10 @@ if ($opt_stage <= 10 && $opt_result)
safe_system
("
rcp
$pwd
/
$host
/*.tar.gz
$opt_result
");
}
log_system
("
$pwd
/
$host
/
$ver
/client/mysqladmin --no-defaults -S
$mysql_unix_port
-u root shutdown
");
rm_all
(
$bench_tmpdir
);
rm_all
("
$opt_tmp
")
if
(
$new_opt_tmp
);
log_system
("
$pwd
/
$host
/bin/mysqladmin --no-defaults -S
$mysql_unix_port
-u root shutdown
");
print
LOG
"
ok
\n
";
close
LOG
;
print
"
$host
: ok
\n
";
...
...
@@ -280,7 +296,7 @@ sub abort
{
$mail_header_file
=
"
$opt_tmp
/do-command.$$
";
open
(
TMP
,"
>
$mail_header_file
");
print
TMP
"
From: mysql
\
@
$
host
.s
e
\n
";
print
TMP
"
From: mysql
\
@
$
full_host_nam
e
\n
";
print
TMP
"
To:
$email
\n
";
print
TMP
"
Subject: MySQL compilation failed again
\n\n
";
close
TMP
;
...
...
Build-tools/Do-patch-file
View file @
bc56e326
...
...
@@ -32,11 +32,11 @@ cd patch
gtar xfz ../
$NEWDIR
/
$NEW
gtar xfz
$RESULT_DIR
/
$OLD
cd
mysql-
$PVER
diff
--
context
--new-file
--recursive
.
../mysql-
$VER
|
gzip
-9
>
../../
$RESULT
diff
--
unified
--new-file
--recursive
.
../mysql-
$VER
|
gzip
-9
>
../../
$RESULT
cd
../..
/bin/rm
-rf
patch
chmod
a+r,o-w
$RESULT
binary/
*
mv
$RESULT
$PATCH_DIR
cp
binary/mysqlcom-
*
/net/web/home/production/data/nweb/customer/
cp
binary/mysqlcom-
*
binary/mysql
*
win
*
/net/web/home/production/data/nweb/customer/Downloads
rm
binary/mysqlcom-
*
cp
binary/
*
$RESULT_DIR
Build-tools/Do-rpm
View file @
bc56e326
...
...
@@ -13,9 +13,9 @@ rpmdir="/usr/src/redhat"
# Perl version numbers. Should be autodetected from the files in the
# Perl-mysql-modules/ directory.
DBI_VERSION
=
"1.1
1
"
DBI_VERSION
=
"1.1
4
"
DATA_SHOWTABLE_VERSION
=
"3.3"
DBD_MYSQL_VERSION
=
"1.22
09
"
DBD_MYSQL_VERSION
=
"1.22
15
"
MAKERPM
=
"
$rpmdir
/SOURCES/makerpm.pl"
#######################
...
...
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