Skip to content

M
MariaDB
Commit 90feb661 authored by unknown's avatar unknown
Browse files
Options

Merge mysql.com:/home/kent/bk/mysql-5.0 

into  mysql.com:/home/kent/bk/mysql-5.1


BitKeeper/deleted/.del-gen_rec.awk:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
configure.in:
  Auto merged
extra/yassl/src/Makefile.am:
  Auto merged
extra/yassl/taocrypt/benchmark/Makefile.am:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/src/Makefile.am:
  Auto merged
extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/taocrypt/test/Makefile.am:
  Auto merged
extra/yassl/testsuite/Makefile.am:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-ha_berkeley.m4:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged
storage/ndb/config/common.mk.am:
  Auto merged
storage/ndb/config/type_kernel.mk.am:
  Auto merged
storage/ndb/config/type_ndbapi.mk.am:
  Auto merged
storage/ndb/config/type_ndbapitest.mk.am:
  Auto merged
storage/ndb/config/type_ndbapitools.mk.am:
  Auto merged
storage/ndb/config/type_util.mk.am:
  Auto merged
Docs/Makefile.am:
  SCCS merged
parents d2f7b75b e9c502b3
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 56 deletions
Docs/Makefile.am
View file @ 90feb661
......@@ -45,22 +45,22 @@ CLEAN_FILES: $(TXT_FILES)
GT = $(srcdir)/generate-text-files.pl
../INSTALL-SOURCE: mysql.info $(GT)
perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@
perl -w $(GT) $(srcdir)/mysql.info "installing-source" "windows-source-build" > $@
../INSTALL-WIN-SOURCE: mysql.info $(GT)
perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@
perl -w $(GT) $(srcdir)/mysql.info "windows-source-build" "post-installation" > $@
# We put the description for the binary installation here so that
# people who download source wont have to see it. It is moved up to
# the toplevel by the script that makes the binary tar files.
INSTALL-BINARY: mysql.info $(GT)
perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@
perl -w $(GT) $(srcdir)/mysql.info "installing-binary" "installing-source" > $@
../EXCEPTIONS-CLIENT: mysql.info $(GT)
perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@
perl -w $(GT) $(srcdir)/mysql.info "mysql-floss-license-exception" "function-index" > $@
../support-files/MacOSX/ReadMe.txt: mysql.info $(GT)
perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@
perl -w $(GT) $(srcdir)/mysql.info "mac-os-x-installation" "netware-installation" > $@
# Include the Windows manual.chm in source .tar.gz only if available.
# It is not in BitKeeper, but is downloaded from intranet by Bootstrap.
......
client/mysql_upgrade.c
View file @ 90feb661
......@@ -373,22 +373,24 @@ static int comp_names(struct fileinfo *a, struct fileinfo *b)
}
static int
find_file(const char *name, const char *root, uint flags, char *result, size_t len, ...)
static int find_file(const char *name, const char *root,
uint flags, char *result, size_t len, ...)
{
int ret;
int ret= 1;
va_list va;
FILEINFO key= { (char*)name, NULL };
const char *subdir;
char *cp;
FILEINFO key;
/* Init key with name of the file to look for */
key.name= (char*)name;
DBUG_ASSERT(root != NULL);
cp= strmake(result, root, len);
if (cp[-1] != FN_LIBCHAR)
*cp++= FN_LIBCHAR;
ret= 1;
va_start(va, len);
subdir= (!(flags & MY_SEARCH_SELF)) ? va_arg(va, char *) : "";
while (subdir)
......
config/ac-macros/ha_ndbcluster.m4
View file @ 90feb661
......@@ -187,7 +187,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
ndb_cxxflags_fix=""
TEST_NDBCLUSTER="--ndbcluster"
ndbcluster_includes="-I\$(top_builddir)/storage/ndb/include -I\$(top_builddir)/storage/ndb/include/ndbapi -I\$(top_builddir)/storage/ndb/include/mgmapi"
ndbcluster_includes="-I\$(top_builddir)/storage/ndb/include -I\$(top_srcdir)/storage/ndb/include -I\$(top_srcdir)/storage/ndb/include/ndbapi -I\$(top_srcdir)/storage/ndb/include/mgmapi"
ndbcluster_libs="\$(top_builddir)/storage/ndb/src/.libs/libndbclient.a"
ndbcluster_system_libs=""
ndb_mgmclient_libs="\$(top_builddir)/storage/ndb/src/mgmclient/libndbmgmclient.la"
......
extra/yassl/src/Makefile.am
View file @ 90feb661
INCLUDES = -I../include -I../taocrypt/include -I../taocrypt/mySTL
INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../taocrypt/include -I$(srcdir)/../taocrypt/mySTL
noinst_LTLIBRARIES = libyassl.la
libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
......
extra/yassl/taocrypt/benchmark/Makefile.am
View file @ 90feb661
INCLUDES = -I../include -I../mySTL
INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../mySTL
bin_PROGRAMS = benchmark
benchmark_SOURCES = benchmark.cpp
benchmark_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
......
extra/yassl/taocrypt/src/Makefile.am
View file @ 90feb661
INCLUDES = -I../include -I../mySTL
INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../mySTL
noinst_LTLIBRARIES = libtaocrypt.la
......
extra/yassl/taocrypt/test/Makefile.am
View file @ 90feb661
INCLUDES = -I../include -I../mySTL
INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../mySTL
bin_PROGRAMS = test
test_SOURCES = test.cpp
test_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
......
extra/yassl/testsuite/Makefile.am
View file @ 90feb661
INCLUDES = -I../include -I../taocrypt/include -I../taocrypt/mySTL
INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../taocrypt/include -I$(srcdir)/../taocrypt/mySTL
bin_PROGRAMS = testsuite
testsuite_SOURCES = testsuite.cpp ../taocrypt/test/test.cpp \
../examples/client/client.cpp ../examples/server/server.cpp \
......
include/my_sys.h
View file @ 90feb661
......@@ -879,7 +879,12 @@ extern int my_getncpus();
#define HAVE_MMAP
#endif
#ifndef __NETWARE__
int my_getpagesize(void);
#else
#define my_getpagesize() 8192
#endif
void *my_mmap(void *, size_t, int, int, int, my_off_t);
int my_munmap(void *, size_t);
#endif
......
libmysql/Makefile.shared
View file @ 90feb661
......@@ -89,8 +89,8 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
if HAVE_YASSL
yassl_las = $(top_srcdir)/extra/yassl/src/libyassl.la \
$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la
yassl_las = $(top_builddir)/extra/yassl/src/libyassl.la \
$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
endif
# The automatic dependencies miss this
......
libmysql_r/Makefile.am
View file @ 90feb661
......@@ -36,12 +36,9 @@ libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
# This is called from the toplevel makefile
link_sources:
set -x; \
for f in `cd $(top_srcdir)/libmysql && echo *.[ch]`; do \
rm -f $$f; \
@LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \
for d in $(top_srcdir)/libmysql $(top_builddir)/libmysql; do \
for f in `cd $$d && echo *.[ch]`; do \
rm -f $$f; \
@LN_CP_F@ $$d/$$f $$f; \
done; \
done
for f in `cd $(top_builddir)/libmysql && echo *.[ch]`; do \
rm -f $$f; \
@LN_CP_F@ $(top_builddir)/libmysql/$$f $$f; \
done
libmysqld/Makefile.am
View file @ 90feb661
......@@ -29,8 +29,8 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
-DLIBDIR="\"$(MYSQLLIBdir)\""
INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \
-I$(top_builddir)/sql -I$(top_srcdir)/sql \
-I$(top_srcdir)/sql/examples \
-I$(top_srcdir)/regex \
$(openssl_includes) @ZLIB_INCLUDES@ \
@condition_dependent_plugin_includes@
......@@ -155,16 +155,28 @@ endif
#libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
#CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la
# This is called from the toplevel makefile
# This is called from the toplevel makefile. If we can link now
# to an existing file in source, we do that, else we assume it
# will show up in the build tree eventually (generated file).
link_sources:
set -x; \
for f in $(sqlsources); do \
rm -f $$f; \
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
if test -e $(top_srcdir)/sql/$$f ; \
then \
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
else \
@LN_CP_F@ $(top_builddir)/sql/$$f $$f; \
fi ; \
done; \
for f in $(libmysqlsources); do \
rm -f $$f; \
@LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \
if test -e $(top_srcdir)/libmysql/$$f ; \
then \
@LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \
else \
@LN_CP_F@ $(top_builddir)/libmysql/$$f $$f; \
fi ; \
done; \
if test -n "$(sqlstoragesources)" ; \
then \
......
mysql-test/lib/mtr_report.pl
View file @ 90feb661
......@@ -89,10 +89,14 @@ sub mtr_report_test_skipped ($) {
{
print "[ disabled ] $tinfo->{'comment'}\n";
}
else
elsif ( $tinfo->{'comment'} )
{
print "[ skipped ] $tinfo->{'comment'}\n";
}
else
{
print "[ skipped ]\n";
}
}
sub mtr_report_tests_not_skipped_though_disabled ($) {
......
mysql-test/mysql-test-run.pl
View file @ 90feb661
......@@ -66,7 +66,6 @@ use IO::Socket::INET;
use Data::Dumper;
use strict;
use warnings;
use diagnostics;
select(STDOUT);
$| = 1; # Automatically flush STDOUT
......
sql-common/my_time.c
View file @ 90feb661
......@@ -780,7 +780,7 @@ long calc_daynr(uint year,uint month,uint day)
*/
my_time_t
my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone,
bool *in_dst_time_gap)
my_bool *in_dst_time_gap)
{
uint loop;
time_t tmp= 0;
......
storage/ndb/config/type_kernel.mk.am
View file @ 90feb661
INCLUDES += \
-I$(srcdir) -I$(top_srcdir)/include \
-I$(srcdir) \
-I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/src/kernel/vm \
-I$(top_srcdir)/storage/ndb/src/kernel/error \
......
storage/ndb/config/type_ndbapi.mk.am
View file @ 90feb661
INCLUDES += \
-I$(srcdir) -I$(top_srcdir)/include \
-I$(srcdir) \
-I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mysys \
-I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/include/kernel \
......
storage/ndb/config/type_ndbapitest.mk.am
View file @ 90feb661
......@@ -5,7 +5,10 @@ LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/include \
INCLUDES += -I$(top_srcdir) \
-I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/include/ndbapi \
-I$(top_srcdir)/storage/ndb/include/util \
......
storage/ndb/config/type_ndbapitools.mk.am
View file @ 90feb661
......@@ -5,7 +5,10 @@ LDADD += \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ @ZLIB_LIBS@
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
INCLUDES += -I$(srcdir) \
-I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/storage/ndb/include \
-I$(top_srcdir)/storage/ndb/include/ndbapi \
-I$(top_srcdir)/storage/ndb/include/util \
......
storage/ndb/config/type_util.mk.am
View file @ 90feb661
INCLUDES += -I$(srcdir) \
-I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mysys \
-I$(top_srcdir)/storage/ndb/include \
......
storage/ndb/src/kernel/Makefile.am
View file @ 90feb661
......@@ -9,22 +9,22 @@ ndbd_SOURCES = main.cpp SimBlockList.cpp
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
INCLUDES += \
-Iblocks/cmvmi \
-Iblocks/dbacc \
-Iblocks/dbdict \
-Iblocks/dbdih \
-Iblocks/dblqh \
-Iblocks/dbtc \
-Iblocks/dbtup \
-Iblocks/ndbfs \
-Iblocks/ndbcntr \
-Iblocks/qmgr \
-Iblocks/trix \
-Iblocks/backup \
-Iblocks/dbutil \
-Iblocks/suma \
-Iblocks/dbtux \
-Iblocks
-I$(srcdir)/blocks/cmvmi \
-I$(srcdir)/blocks/dbacc \
-I$(srcdir)/blocks/dbdict \
-I$(srcdir)/blocks/dbdih \
-I$(srcdir)/blocks/dblqh \
-I$(srcdir)/blocks/dbtc \
-I$(srcdir)/blocks/dbtup \
-I$(srcdir)/blocks/ndbfs \
-I$(srcdir)/blocks/ndbcntr \
-I$(srcdir)/blocks/qmgr \
-I$(srcdir)/blocks/trix \
-I$(srcdir)/blocks/backup \
-I$(srcdir)/blocks/dbutil \
-I$(srcdir)/blocks/suma \
-I$(srcdir)/blocks/dbtux \
-I$(srcdir)/blocks
LDADD += \
blocks/libblocks.a \
......
storage/ndb/src/mgmsrv/Makefile.am
View file @ 90feb661
......@@ -23,7 +23,7 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/ndbapi \
-I$(top_srcdir)/storage/ndb/src/common/mgmcommon \
-I$(top_srcdir)/storage/ndb/src/mgmclient
LDADD_LOC = $(top_srcdir)/storage/ndb/src/mgmclient/CommandInterpreter.o \
LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.o \
$(top_builddir)/storage/ndb/src/libndbclient.la \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7