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
af739b2c
Commit
af739b2c
authored
Jan 07, 2009
by
Patrick Crews
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
fec0b2c2
374f49b2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
23 deletions
+53
-23
BUILD/compile-dist
BUILD/compile-dist
+28
-8
configure.in
configure.in
+16
-12
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+8
-2
support-files/my-small.cnf.sh
support-files/my-small.cnf.sh
+1
-1
No files found.
BUILD/compile-dist
View file @
af739b2c
...
...
@@ -15,30 +15,49 @@ autoconf
(
cd
bdb/dist
&&
sh s_all
)
(
cd
innobase
&&
aclocal
&&
autoheader
&&
aclocal
&&
automake
&&
autoconf
)
gmake
=
for
x
in
gmake gnumake make
;
do
if
$x
--version
2>/dev/null |
grep
GNU
>
/dev/null
;
then
gmake
=
$x
break
;
fi
done
if
[
-z
"
$gmake
"
]
;
then
# Our build may not depend on GNU make, but I wouldn't count on it
echo
"Please install GNU make, and ensure it is in your path as gnumake, gmake, or make"
>
&2
exit
2
fi
# Default to gcc for CC and CXX
if
test
-z
"
$CXX
"
;
then
export
CXX
=
gcc
export
CXX
CXX
=
gcc
# Set some required compile options
if
test
-z
"
$CXXFLAGS
"
;
then
export
CXXFLAGS
=
"-felide-constructors -fno-exceptions -fno-rtti"
export
CXXFLAGS
CXXFLAGS
=
"-felide-constructors -fno-exceptions -fno-rtti"
fi
fi
if
test
-z
"
$CC
"
;
then
export
CC
=
gcc
export
CC
CC
=
gcc
fi
# Use ccache, if available
if
ccache
-V
>
/dev/null 2>&1
then
if
!
(
echo
"
$CC
"
|
grep
"ccache"
>
/dev/null
)
if
echo
"
$CC
"
|
grep
-v
ccache
>
/dev/null
then
export
CC
=
"ccache
$CC
"
export
CC
CC
=
"ccache
$CC
"
fi
if
!
(
echo
"
$CXX
"
|
grep
"ccache"
>
/dev/null
)
if
echo
"
$CXX
"
|
grep
-v
ccache
>
/dev/null
then
export
CXX
=
"ccache
$CXX
"
export
CXX
CXX
=
"ccache
$CXX
"
fi
fi
...
...
@@ -50,4 +69,5 @@ fi
--enable-thread-safe-client
\
--with-extra-charsets
=
complex
\
--with-ndbcluster
make
$gmake
configure.in
View file @
af739b2c
...
...
@@ -409,7 +409,7 @@ fi
MYSQL_PROG_AR
# libmysqlclient versioning when linked with GNU ld.
if
$LD
--version
2>/dev/null|grep
-q
GNU
;
then
if
$LD
--version
2>/dev/null|grep
GNU
>
/dev/null
;
then
LD_VERSION_SCRIPT
=
"-Wl,--version-script=
\$
(top_builddir)/libmysql/libmysql.ver"
AC_CONFIG_FILES
(
libmysql/libmysql.ver
)
fi
...
...
@@ -437,11 +437,13 @@ dnl Find paths to some shell programs
AC_PATH_PROG
(
LN,
ln
,
ln
)
# This must be able to take a -f flag like normal unix ln.
AC_PATH_PROG
(
LN_CP_F,
ln
,
ln
)
if
!
(
expr
"
$SYSTEM_TYPE
"
:
".*netware.*"
>
/dev/null
)
;
then
# If ln -f does not exists use -s (AFS systems)
if
test
-n
"
$LN_CP_F
"
;
then
if
expr
"
$SYSTEM_TYPE
"
:
".*netware.*"
>
/dev/null
;
then
:
else
# If ln -f does not exists use -s (AFS systems)
if
test
-n
"
$LN_CP_F
"
;
then
LN_CP_F
=
"
$LN_CP_F
-s"
fi
fi
fi
AC_PATH_PROG
(
MV,
mv
,
mv
)
...
...
@@ -1940,14 +1942,16 @@ MYSQL_CHECK_IN_ADDR_T
# Do the c++ compiler have a bool type
MYSQL_CXX_BOOL
# Check some common bugs with gcc 2.8.# on sparc
if
!
(
expr
"
$SYSTEM_TYPE
"
:
".*netware.*"
>
/dev/null
)
;
then
MYSQL_CHECK_LONGLONG_TO_FLOAT
if
test
"
$ac_cv_conv_longlong_to_float
"
!=
"yes"
then
if
expr
"
$SYSTEM_TYPE
"
:
".*netware.*"
>
/dev/null
;
then
:
else
MYSQL_CHECK_LONGLONG_TO_FLOAT
if
test
"
$ac_cv_conv_longlong_to_float
"
!=
"yes"
then
AC_MSG_ERROR
([
Your compiler cannot convert a longlong value to a float!
If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try
again]
)
fi
fi
fi
AC_CHECK_TYPES
([
sigset_t, off_t],
[]
,
[]
,
[
#include <sys/types.h>])
AC_CHECK_TYPES
([
size_t],
[]
,
[]
,
[
#include <stdio.h>])
...
...
mysql-test/mysql-test-run.pl
View file @
af739b2c
...
...
@@ -1508,15 +1508,21 @@ sub executable_setup_ndb () {
"
$glob_basedir
/storage/ndb
",
"
$glob_basedir
/bin
");
# Some might be found in sbin, not bin.
my
$daemon_path
=
mtr_file_exists
("
$glob_basedir
/ndb
",
"
$glob_basedir
/storage/ndb
",
"
$glob_basedir
/sbin
",
"
$glob_basedir
/bin
");
$exe_ndbd
=
mtr_exe_maybe_exists
("
$ndb_path
/src/kernel/ndbd
",
"
$
ndb
_path
/ndbd
");
"
$
daemon
_path
/ndbd
");
$exe_ndb_mgm
=
mtr_exe_maybe_exists
("
$ndb_path
/src/mgmclient/ndb_mgm
",
"
$ndb_path
/ndb_mgm
");
$exe_ndb_mgmd
=
mtr_exe_maybe_exists
("
$ndb_path
/src/mgmsrv/ndb_mgmd
",
"
$
ndb
_path
/ndb_mgmd
");
"
$
daemon
_path
/ndb_mgmd
");
$exe_ndb_waiter
=
mtr_exe_maybe_exists
("
$ndb_path
/tools/ndb_waiter
",
"
$ndb_path
/ndb_waiter
");
...
...
support-files/my-small.cnf.sh
View file @
af739b2c
...
...
@@ -34,7 +34,7 @@ sort_buffer_size = 64K
read_buffer_size
=
256K
read_rnd_buffer_size
=
256K
net_buffer_length
=
2K
thread_stack
=
64
K
thread_stack
=
128
K
# Don't listen on a TCP/IP port at all. This can be a security enhancement,
# if all processes that need to connect to mysqld run on the same host.
...
...
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