mirror of
https://github.com/MariaDB/server.git
synced 2025-01-28 09:44:17 +01:00
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
This commit is contained in:
commit
29aa70c5c9
3389 changed files with 4075 additions and 2538 deletions
BUILD
FINISH.shcheck-cpucompile-alpha-cxxcompile-alpha-debugcompile-distcompile-hpux11-parisc2-aCCcompile-ia64-debug-maxcompile-irix-mips64-mipsprocompile-pentium-pgcccompile-solaris-sparccompile-solaris-sparc-debugcompile-solaris-sparc-fortecompile-solaris-sparc-purify
BitKeeper
Makefile.amclient
config/ac-macros
configure.inextra
include
libmysqld
mysql-test
mysql-test-run.sh
ndb
r
archive.resultbigint.resultcast.resultgis-rtree.resultgis.resultgroup_by.resultinnodb-replace.resultndb_multi.resulttemp_table.resulttype_decimal.resultuser_var.result
t
mysys
ndb
config
type_kernel.mk.amtype_mgmapiclient.mk.amtype_ndbapi.mk.amtype_ndbapiclient.mk.amtype_ndbapitest.mk.amtype_ndbapitools.mk.amtype_util.mk.am
src
Makefile.am
common
kernel
blocks
backup
cmvmi
dbacc
dbdict
dbdih
dblqh
dbtc
dbtup
dbtux
dbutil
grep
ndbcntr
ndbfs
qmgr
suma
trix
error
vm
mgmapi
mgmclient
mgmsrv
test
tools
scripts
sql
|
@ -11,15 +11,15 @@ done
|
|||
|
||||
commands="\
|
||||
$make -k distclean || true
|
||||
/bin/rm -rf */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache bdb/dist/autom4te.cache autom4te.cache innobase/autom4te.cache;
|
||||
/bin/rm -rf */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache bdb/dist/autom4te.cache autom4te.cache innobase/autom4te.cache;
|
||||
|
||||
aclocal || (echo \"Can't execute aclocal\" && exit 1)
|
||||
autoheader || (echo \"Can't execute autoheader\" && exit 1)
|
||||
aclocal || (echo \"Can't execute aclocal\" && exit 1)
|
||||
automake || (echo \"Can't execute automake\" && exit 1)
|
||||
autoconf || (echo \"Can't execute autoconf\" && exit 1)
|
||||
(cd bdb/dist && sh s_all)
|
||||
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
(cd storage/bdb/dist && sh s_all)
|
||||
(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
if [ -d gemini ]
|
||||
then
|
||||
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
|
|
|
@ -19,8 +19,6 @@ if test -r /proc/cpuinfo ; then
|
|||
if test -z "$model_name" ; then
|
||||
model_name=`uname -m`
|
||||
fi
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
|
||||
case "$cpu_family--$model_name" in
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/bin/rm -f */.deps/*.P */*.o
|
||||
make -k clean
|
||||
/bin/rm -f */.deps/*.P */*.o
|
||||
/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz
|
||||
/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz
|
||||
aclocal; autoheader; aclocal; automake; autoconf
|
||||
|
||||
CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared --without-extra-tools --disable-dependency-tracking
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/bin/rm -f */.deps/*.P */*.o
|
||||
make -k clean
|
||||
/bin/rm -f */.deps/*.P */*.o
|
||||
/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz
|
||||
/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz
|
||||
aclocal; autoheader; aclocal; automake; autoconf
|
||||
|
||||
CFLAGS=-O1 CC=gcc CXX=gcc CXXFLAGS="-O1 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-debug --with-extra-charsets=complex --without-extra-tools
|
||||
|
|
|
@ -12,8 +12,8 @@ autoheader
|
|||
libtoolize --automake --force --copy
|
||||
automake --force --add-missing --copy
|
||||
autoconf
|
||||
(cd bdb/dist && sh s_all)
|
||||
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
(cd storage/bdb/dist && sh s_all)
|
||||
(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
|
||||
# Default to gcc for CC and CXX
|
||||
if test -z "$CXX" ; then
|
||||
|
|
|
@ -68,8 +68,8 @@ libtoolize --automake --force
|
|||
automake --force --add-missing
|
||||
autoconf
|
||||
|
||||
(cd bdb/dist && sh s_all)
|
||||
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
(cd storage/bdb/dist && sh s_all)
|
||||
(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
|
||||
CC=cc CXX=aCC CFLAGS="$cflags" CXXFLAGS="$cxxflags" \
|
||||
./configure --prefix=/usr/local/mysql --disable-shared \
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
gmake -k clean || true
|
||||
/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache
|
||||
/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache
|
||||
|
||||
aclocal && autoheader && aclocal && automake && autoconf
|
||||
(cd bdb/dist && sh s_all)
|
||||
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
(cd storage/bdb/dist && sh s_all)
|
||||
(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
if [ -d gemini ]
|
||||
then
|
||||
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
|
|
|
@ -40,8 +40,8 @@ libtoolize --automake --force
|
|||
automake --force --add-missing
|
||||
autoconf
|
||||
|
||||
(cd bdb/dist && sh s_all)
|
||||
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
(cd storage/bdb/dist && sh s_all)
|
||||
(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
|
||||
# C options:
|
||||
# -apo - auto-parallize for multiprocessors (implies -mp)
|
||||
|
|
|
@ -3,8 +3,8 @@ gmake -k clean || true
|
|||
/bin/rm -f */.deps/*.P config.cache
|
||||
|
||||
aclocal && autoheader && aclocal && automake && autoconf
|
||||
(cd bdb/dist && sh s_all)
|
||||
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
(cd storage/bdb/dist && sh s_all)
|
||||
(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
if [ -d gemini ]
|
||||
then
|
||||
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
|
|
|
@ -4,8 +4,8 @@ gmake -k clean || true
|
|||
/bin/rm -f */.deps/*.P config.cache
|
||||
|
||||
aclocal && autoheader && aclocal && automake && autoconf
|
||||
(cd bdb/dist && sh s_all)
|
||||
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
(cd storage/bdb/dist && sh s_all)
|
||||
(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
if [ -d gemini ]
|
||||
then
|
||||
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
|
|
|
@ -4,8 +4,8 @@ gmake -k clean || true
|
|||
/bin/rm -f */.deps/*.P config.cache
|
||||
|
||||
aclocal && autoheader && aclocal && automake && autoconf
|
||||
(cd bdb/dist && sh s_all)
|
||||
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
(cd storage/bdb/dist && sh s_all)
|
||||
(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
if [ -d gemini ]
|
||||
then
|
||||
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
|
|
|
@ -4,8 +4,8 @@ gmake -k clean || true
|
|||
/bin/rm -f */.deps/*.P config.cache
|
||||
|
||||
aclocal && autoheader && aclocal && automake && autoconf
|
||||
(cd bdb/dist && sh s_all)
|
||||
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
(cd storage/bdb/dist && sh s_all)
|
||||
(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
if [ -d gemini ]
|
||||
then
|
||||
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
|
|
|
@ -34,8 +34,8 @@ done
|
|||
gmake -k clean || true
|
||||
/bin/rm -f */.deps/*.P config.cache
|
||||
aclocal && autoheader && aclocal && automake && autoconf
|
||||
(cd bdb/dist && sh s_all)
|
||||
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
(cd storage/bdb/dist && sh s_all)
|
||||
(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
|
||||
|
||||
CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS
|
||||
|
||||
|
|
|
@ -50,6 +50,8 @@ dlenev@build.mysql.com
|
|||
dlenev@jabberwock.localdomain
|
||||
dlenev@mysql.com
|
||||
ejonore@mc03.ndb.mysql.com
|
||||
evgen@moonbone.(none)
|
||||
evgen@moonbone.local
|
||||
gbichot@production.mysql.com
|
||||
gbichot@quadita2.mysql.com
|
||||
gbichot@quadxeon.mysql.com
|
||||
|
@ -192,6 +194,7 @@ papa@gbichot.local
|
|||
patg@krsna.
|
||||
patg@krsna.patg.net
|
||||
patg@patrick-galbraiths-computer.local
|
||||
patg@patrick.local
|
||||
patg@pc248.lfp.kcls.org
|
||||
paul@central.snake.net
|
||||
paul@frost.snake.net
|
||||
|
|
|
@ -5,7 +5,7 @@ FROM=$USER@mysql.com
|
|||
INTERNALS=internals@lists.mysql.com
|
||||
DOCS=docs-commit@mysql.com
|
||||
LIMIT=10000
|
||||
VERSION="5.0"
|
||||
VERSION="5.1"
|
||||
|
||||
if [ "$REAL_EMAIL" = "" ]
|
||||
then
|
||||
|
|
|
@ -102,5 +102,10 @@ tags:
|
|||
test:
|
||||
cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol
|
||||
|
||||
test-force:
|
||||
cd mysql-test; \
|
||||
mysql-test-run --force ;\
|
||||
mysql-test-run --ps-protocol --force
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
|
|
@ -727,7 +727,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
|
|||
void (*func) (MYSQL_RES*, MYSQL_ROW, uint);
|
||||
|
||||
new_line = 1;
|
||||
if (mysql_query(mysql, "show status") ||
|
||||
if (mysql_query(mysql, "show /*!50002 GLOBAL */ status") ||
|
||||
!(res = mysql_store_result(mysql)))
|
||||
{
|
||||
my_printf_error(0, "unable to show status; error: '%s'", MYF(ME_BELL),
|
||||
|
|
|
@ -187,7 +187,7 @@ AC_DEFUN([MYSQL_SEARCH_FOR_BDB], [
|
|||
dnl echo ["MYSQL_SEARCH_FOR_BDB"]
|
||||
bdb_dir_ok="no BerkeleyDB found"
|
||||
|
||||
for test_dir in $srcdir/bdb $srcdir/db-*.*.* /usr/local/BerkeleyDB*; do
|
||||
for test_dir in $srcdir/storage/bdb $srcdir/db-*.*.* /usr/local/BerkeleyDB*; do
|
||||
dnl echo "-----------> Looking at ($test_dir; `cd $test_dir && pwd`)"
|
||||
MYSQL_CHECK_BDB_DIR([$test_dir])
|
||||
if test X"$bdb_dir_ok" = Xsource || test X"$bdb_dir_ok" = Xinstalled; then
|
||||
|
|
|
@ -20,45 +20,45 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [
|
|||
AC_MSG_RESULT([Using Innodb])
|
||||
AC_DEFINE([HAVE_INNOBASE_DB], [1], [Using Innobase DB])
|
||||
have_innodb="yes"
|
||||
innodb_includes="-I../innobase/include"
|
||||
innodb_includes="-I\$(top_builddir)/innobase/include"
|
||||
innodb_system_libs=""
|
||||
dnl Some libs are listed several times, in order for gcc to sort out
|
||||
dnl circular references.
|
||||
innodb_libs="\
|
||||
\$(top_builddir)/innobase/usr/libusr.a\
|
||||
\$(top_builddir)/innobase/srv/libsrv.a\
|
||||
\$(top_builddir)/innobase/dict/libdict.a\
|
||||
\$(top_builddir)/innobase/que/libque.a\
|
||||
\$(top_builddir)/innobase/srv/libsrv.a\
|
||||
\$(top_builddir)/innobase/ibuf/libibuf.a\
|
||||
\$(top_builddir)/innobase/row/librow.a\
|
||||
\$(top_builddir)/innobase/pars/libpars.a\
|
||||
\$(top_builddir)/innobase/btr/libbtr.a\
|
||||
\$(top_builddir)/innobase/trx/libtrx.a\
|
||||
\$(top_builddir)/innobase/read/libread.a\
|
||||
\$(top_builddir)/innobase/usr/libusr.a\
|
||||
\$(top_builddir)/innobase/buf/libbuf.a\
|
||||
\$(top_builddir)/innobase/ibuf/libibuf.a\
|
||||
\$(top_builddir)/innobase/eval/libeval.a\
|
||||
\$(top_builddir)/innobase/log/liblog.a\
|
||||
\$(top_builddir)/innobase/fsp/libfsp.a\
|
||||
\$(top_builddir)/innobase/fut/libfut.a\
|
||||
\$(top_builddir)/innobase/fil/libfil.a\
|
||||
\$(top_builddir)/innobase/lock/liblock.a\
|
||||
\$(top_builddir)/innobase/mtr/libmtr.a\
|
||||
\$(top_builddir)/innobase/page/libpage.a\
|
||||
\$(top_builddir)/innobase/rem/librem.a\
|
||||
\$(top_builddir)/innobase/thr/libthr.a\
|
||||
\$(top_builddir)/innobase/sync/libsync.a\
|
||||
\$(top_builddir)/innobase/data/libdata.a\
|
||||
\$(top_builddir)/innobase/mach/libmach.a\
|
||||
\$(top_builddir)/innobase/ha/libha.a\
|
||||
\$(top_builddir)/innobase/dyn/libdyn.a\
|
||||
\$(top_builddir)/innobase/mem/libmem.a\
|
||||
\$(top_builddir)/innobase/sync/libsync.a\
|
||||
\$(top_builddir)/innobase/ut/libut.a\
|
||||
\$(top_builddir)/innobase/os/libos.a\
|
||||
\$(top_builddir)/innobase/ut/libut.a"
|
||||
\$(top_builddir)/storage/innobase/usr/libusr.a\
|
||||
\$(top_builddir)/storage/innobase/srv/libsrv.a\
|
||||
\$(top_builddir)/storage/innobase/dict/libdict.a\
|
||||
\$(top_builddir)/storage/innobase/que/libque.a\
|
||||
\$(top_builddir)/storage/innobase/srv/libsrv.a\
|
||||
\$(top_builddir)/storage/innobase/ibuf/libibuf.a\
|
||||
\$(top_builddir)/storage/innobase/row/librow.a\
|
||||
\$(top_builddir)/storage/innobase/pars/libpars.a\
|
||||
\$(top_builddir)/storage/innobase/btr/libbtr.a\
|
||||
\$(top_builddir)/storage/innobase/trx/libtrx.a\
|
||||
\$(top_builddir)/storage/innobase/read/libread.a\
|
||||
\$(top_builddir)/storage/innobase/usr/libusr.a\
|
||||
\$(top_builddir)/storage/innobase/buf/libbuf.a\
|
||||
\$(top_builddir)/storage/innobase/ibuf/libibuf.a\
|
||||
\$(top_builddir)/storage/innobase/eval/libeval.a\
|
||||
\$(top_builddir)/storage/innobase/log/liblog.a\
|
||||
\$(top_builddir)/storage/innobase/fsp/libfsp.a\
|
||||
\$(top_builddir)/storage/innobase/fut/libfut.a\
|
||||
\$(top_builddir)/storage/innobase/fil/libfil.a\
|
||||
\$(top_builddir)/storage/innobase/lock/liblock.a\
|
||||
\$(top_builddir)/storage/innobase/mtr/libmtr.a\
|
||||
\$(top_builddir)/storage/innobase/page/libpage.a\
|
||||
\$(top_builddir)/storage/innobase/rem/librem.a\
|
||||
\$(top_builddir)/storage/innobase/thr/libthr.a\
|
||||
\$(top_builddir)/storage/innobase/sync/libsync.a\
|
||||
\$(top_builddir)/storage/innobase/data/libdata.a\
|
||||
\$(top_builddir)/storage/innobase/mach/libmach.a\
|
||||
\$(top_builddir)/storage/innobase/ha/libha.a\
|
||||
\$(top_builddir)/storage/innobase/dyn/libdyn.a\
|
||||
\$(top_builddir)/storage/innobase/mem/libmem.a\
|
||||
\$(top_builddir)/storage/innobase/sync/libsync.a\
|
||||
\$(top_builddir)/storage/innobase/ut/libut.a\
|
||||
\$(top_builddir)/storage/innobase/os/libos.a\
|
||||
\$(top_builddir)/storage/innobase/ut/libut.a"
|
||||
|
||||
AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
|
||||
;;
|
||||
|
|
|
@ -131,10 +131,10 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
|
|||
AC_MSG_RESULT([Using NDB Cluster])
|
||||
AC_DEFINE([HAVE_NDBCLUSTER_DB], [1], [Using Ndb Cluster DB])
|
||||
have_ndbcluster="yes"
|
||||
ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"
|
||||
ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a"
|
||||
ndbcluster_includes="-I\$(top_builddir)/storage/ndb/include -I\$(top_builddir)/storage/ndb/include/ndbapi"
|
||||
ndbcluster_libs="\$(top_builddir)/storage/ndb/src/.libs/libndbclient.a"
|
||||
ndbcluster_system_libs=""
|
||||
ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la"
|
||||
ndb_mgmclient_libs="\$(top_builddir)/storage/ndb/src/mgmclient/libndbmgmclient.la"
|
||||
MYSQL_CHECK_NDB_OPTIONS
|
||||
;;
|
||||
* )
|
||||
|
|
|
@ -646,8 +646,8 @@ m4_define([_AC_PROG_CXX_EXIT_DECLARATION],
|
|||
'void exit (int);' \
|
||||
'#include <stdlib.h>'
|
||||
do
|
||||
_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <stdlib.h>
|
||||
$ac_declaration],
|
||||
_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$ac_declaration
|
||||
@%:@include <stdlib.h>],
|
||||
[exit (42);])],
|
||||
[],
|
||||
[continue])
|
||||
|
|
129
configure.in
129
configure.in
|
@ -5,8 +5,9 @@ AC_PREREQ(2.50)dnl Minimum Autoconf version required.
|
|||
|
||||
AC_INIT(sql/mysqld.cc)
|
||||
AC_CANONICAL_SYSTEM
|
||||
# The Docs Makefile.am parses this line!
|
||||
# Don't forget to also update the NDB lines below.
|
||||
AM_INIT_AUTOMAKE(mysql, 5.0.6-beta)
|
||||
AM_INIT_AUTOMAKE(mysql, 5.1.0-alpha)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
PROTOCOL_VERSION=10
|
||||
|
@ -16,9 +17,8 @@ SHARED_LIB_VERSION=14:0:0
|
|||
|
||||
# ndb version
|
||||
NDB_VERSION_MAJOR=5
|
||||
NDB_VERSION_MINOR=0
|
||||
NDB_VERSION_BUILD=6
|
||||
NDB_VERSION_STATUS="beta"
|
||||
NDB_VERSION_MINOR=1
|
||||
NDB_VERSION_BUILD=0
|
||||
|
||||
# Set all version vars based on $VERSION. How do we do this more elegant ?
|
||||
# Remember that regexps needs to quote [ and ] since this is run through m4
|
||||
|
@ -116,8 +116,6 @@ AC_SUBST(SAVE_LDFLAGS)
|
|||
AC_SUBST(SAVE_CXXLDFLAGS)
|
||||
AC_SUBST(CXXLDFLAGS)
|
||||
|
||||
AC_PREREQ(2.58)dnl Minimum Autoconf version required.
|
||||
|
||||
#AC_ARG_PROGRAM # Automaticly invoked by AM_INIT_AUTOMAKE
|
||||
|
||||
AM_SANITY_CHECK
|
||||
|
@ -1800,6 +1798,9 @@ If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try
|
|||
again]);
|
||||
fi
|
||||
fi
|
||||
AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
|
||||
AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])
|
||||
|
||||
MYSQL_PTHREAD_YIELD
|
||||
|
||||
######################################################################
|
||||
|
@ -2484,7 +2485,7 @@ then
|
|||
if test X"$have_berkeley_db" != Xyes; then
|
||||
# we must build berkeley db from source
|
||||
sql_server_dirs="$sql_server_dirs $have_berkeley_db"
|
||||
AC_CONFIG_FILES(bdb/Makefile)
|
||||
AC_CONFIG_FILES(storage/bdb/Makefile)
|
||||
|
||||
echo "CONFIGURING FOR BERKELEY DB"
|
||||
bdb_conf_flags="--disable-shared"
|
||||
|
@ -2510,8 +2511,10 @@ then
|
|||
rel_srcdir=
|
||||
case "$srcdir" in
|
||||
/* ) rel_srcdir="$srcdir" ;;
|
||||
* ) rel_srcdir="../../$srcdir" ;;
|
||||
* ) rel_srcdir="../../../$srcdir" ;;
|
||||
esac
|
||||
echo $bdb/build_unix
|
||||
echo $rel_srcdir/$bdb/dist/configure
|
||||
(cd $bdb/build_unix && \
|
||||
sh $rel_srcdir/$bdb/dist/configure $bdb_conf_flags) || \
|
||||
AC_MSG_ERROR([could not configure Berkeley DB])
|
||||
|
@ -2524,12 +2527,12 @@ dnl echo "bdb = '$bdb'; inc = '$bdb_includes', lib = '$bdb_libs'"
|
|||
else
|
||||
if test -d bdb; then :
|
||||
else
|
||||
mkdir bdb && mkdir bdb/build_unix
|
||||
mkdir storage/bdb && mkdir storage/bdb/build_unix
|
||||
fi
|
||||
|
||||
if test -r bdb/build_unix/db.h; then :
|
||||
if test -r storage/bdb/build_unix/db.h; then :
|
||||
else
|
||||
cat <<EOF > bdb/build_unix/db.h
|
||||
cat <<EOF > storage/bdb/build_unix/db.h
|
||||
|
||||
This file is a placeholder to fool make. The way that automake
|
||||
and GNU make work together causes some files to depend on this
|
||||
|
@ -2552,8 +2555,8 @@ EOF
|
|||
if test X"$have_innodb" = Xyes
|
||||
then
|
||||
innodb_conf_flags=""
|
||||
sql_server_dirs="$sql_server_dirs innobase"
|
||||
AC_CONFIG_SUBDIRS(innobase)
|
||||
sql_server_dirs="$sql_server_dirs storage/innobase"
|
||||
AC_CONFIG_SUBDIRS(storage/innobase)
|
||||
fi
|
||||
|
||||
case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in
|
||||
|
@ -2575,12 +2578,12 @@ esac
|
|||
echo
|
||||
exit 1
|
||||
fi
|
||||
sql_server_dirs="$sql_server_dirs ndb"
|
||||
sql_server_dirs="$sql_server_dirs storage/ndb"
|
||||
fi
|
||||
#
|
||||
# END of configuration for optional table handlers
|
||||
#
|
||||
sql_server_dirs="$sql_server_dirs myisam myisammrg heap vio sql"
|
||||
sql_server_dirs="$sql_server_dirs storage/myisam storage/myisammrg storage/heap vio sql"
|
||||
|
||||
fi
|
||||
|
||||
|
@ -2713,51 +2716,53 @@ AC_SUBST([NDB_SIZEOF_INT])
|
|||
AC_SUBST([NDB_SIZEOF_LONG])
|
||||
AC_SUBST([NDB_SIZEOF_LONG_LONG])
|
||||
|
||||
AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl
|
||||
ndb/src/Makefile ndb/src/common/Makefile dnl
|
||||
ndb/docs/Makefile dnl
|
||||
ndb/tools/Makefile dnl
|
||||
ndb/src/common/debugger/Makefile dnl
|
||||
ndb/src/common/debugger/signaldata/Makefile dnl
|
||||
ndb/src/common/portlib/Makefile dnl
|
||||
ndb/src/common/util/Makefile dnl
|
||||
ndb/src/common/logger/Makefile dnl
|
||||
ndb/src/common/transporter/Makefile dnl
|
||||
ndb/src/common/mgmcommon/Makefile dnl
|
||||
ndb/src/kernel/Makefile dnl
|
||||
ndb/src/kernel/error/Makefile dnl
|
||||
ndb/src/kernel/blocks/Makefile dnl
|
||||
ndb/src/kernel/blocks/cmvmi/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbacc/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbdict/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbdih/Makefile dnl
|
||||
ndb/src/kernel/blocks/dblqh/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbtc/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbtup/Makefile dnl
|
||||
ndb/src/kernel/blocks/ndbfs/Makefile dnl
|
||||
ndb/src/kernel/blocks/ndbcntr/Makefile dnl
|
||||
ndb/src/kernel/blocks/qmgr/Makefile dnl
|
||||
ndb/src/kernel/blocks/trix/Makefile dnl
|
||||
ndb/src/kernel/blocks/backup/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbutil/Makefile dnl
|
||||
ndb/src/kernel/blocks/suma/Makefile dnl
|
||||
ndb/src/kernel/blocks/grep/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbtux/Makefile dnl
|
||||
ndb/src/kernel/vm/Makefile dnl
|
||||
ndb/src/mgmapi/Makefile dnl
|
||||
ndb/src/ndbapi/Makefile dnl
|
||||
ndb/src/mgmsrv/Makefile dnl
|
||||
ndb/src/mgmclient/Makefile dnl
|
||||
ndb/src/cw/Makefile dnl
|
||||
ndb/src/cw/cpcd/Makefile dnl
|
||||
ndb/test/Makefile dnl
|
||||
ndb/test/src/Makefile dnl
|
||||
ndb/test/ndbapi/Makefile dnl
|
||||
ndb/test/ndbapi/bank/Makefile dnl
|
||||
ndb/test/tools/Makefile dnl
|
||||
ndb/test/run-test/Makefile mysql-test/ndb/Makefile dnl
|
||||
ndb/include/ndb_version.h ndb/include/ndb_global.h dnl
|
||||
ndb/include/ndb_types.h dnl
|
||||
AC_CONFIG_FILES(storage/ndb/Makefile storage/ndb/include/Makefile dnl
|
||||
storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl
|
||||
storage/ndb/docs/Makefile dnl
|
||||
storage/ndb/tools/Makefile dnl
|
||||
storage/ndb/src/common/debugger/Makefile dnl
|
||||
storage/ndb/src/common/debugger/signaldata/Makefile dnl
|
||||
storage/ndb/src/common/portlib/Makefile dnl
|
||||
storage/ndb/src/common/util/Makefile dnl
|
||||
storage/ndb/src/common/logger/Makefile dnl
|
||||
storage/ndb/src/common/transporter/Makefile dnl
|
||||
storage/ndb/src/common/mgmcommon/Makefile dnl
|
||||
storage/ndb/src/kernel/Makefile dnl
|
||||
storage/ndb/src/kernel/error/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/cmvmi/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbacc/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbdict/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbdih/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dblqh/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbtc/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbtup/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/ndbfs/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/ndbcntr/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/qmgr/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/trix/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/backup/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbutil/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/suma/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/grep/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbtux/Makefile dnl
|
||||
storage/ndb/src/kernel/vm/Makefile dnl
|
||||
storage/ndb/src/mgmapi/Makefile dnl
|
||||
storage/ndb/src/ndbapi/Makefile dnl
|
||||
storage/ndb/src/mgmsrv/Makefile dnl
|
||||
storage/ndb/src/mgmclient/Makefile dnl
|
||||
storage/ndb/src/cw/Makefile dnl
|
||||
storage/ndb/src/cw/cpcd/Makefile dnl
|
||||
storage/ndb/test/Makefile dnl
|
||||
storage/ndb/test/src/Makefile dnl
|
||||
storage/ndb/test/ndbapi/Makefile dnl
|
||||
storage/ndb/test/ndbapi/bank/Makefile dnl
|
||||
storage/ndb/test/tools/Makefile dnl
|
||||
storage/ndb/test/run-test/Makefile dnl
|
||||
storage/ndb/include/ndb_version.h dnl
|
||||
storage/ndb/include/ndb_global.h dnl
|
||||
storage/ndb/include/ndb_types.h dnl
|
||||
mysql-test/ndb/Makefile dnl
|
||||
)
|
||||
fi
|
||||
|
||||
|
@ -2765,8 +2770,8 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
|
|||
|
||||
# Output results
|
||||
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
|
||||
strings/Makefile regex/Makefile heap/Makefile dnl
|
||||
myisam/Makefile myisammrg/Makefile dnl
|
||||
strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl
|
||||
storage/myisam/Makefile storage/myisammrg/Makefile dnl
|
||||
os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
|
||||
man/Makefile BUILD/Makefile vio/Makefile dnl
|
||||
libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile dnl
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <errno.h>
|
||||
#include <my_getopt.h>
|
||||
#ifdef HAVE_NDBCLUSTER_DB
|
||||
#include "../ndb/src/ndbapi/ndberror.c"
|
||||
#include "../storage/ndb/src/ndbapi/ndberror.c"
|
||||
#endif
|
||||
|
||||
static my_bool verbose, print_all_codes;
|
||||
|
|
|
@ -106,20 +106,33 @@ functions */
|
|||
|
||||
/* Type information */
|
||||
|
||||
#if defined(__EMX__) || !defined(HAVE_UINT)
|
||||
#undef HAVE_UINT
|
||||
#define HAVE_UINT
|
||||
typedef unsigned short ushort;
|
||||
typedef unsigned int uint;
|
||||
#endif /* defined(__EMX__) || !defined(HAVE_UINT) */
|
||||
|
||||
typedef unsigned __int64 ulonglong; /* Microsofts 64 bit types */
|
||||
typedef __int64 longlong;
|
||||
#ifndef HAVE_SIGSET_T
|
||||
typedef int sigset_t;
|
||||
#endif
|
||||
#define longlong_defined
|
||||
/* off_t should not be __int64 because of conflicts in header files;
|
||||
Use my_off_t or os_off_t instead */
|
||||
/*
|
||||
off_t should not be __int64 because of conflicts in header files;
|
||||
Use my_off_t or os_off_t instead
|
||||
*/
|
||||
#ifndef HAVE_OFF_T
|
||||
typedef long off_t;
|
||||
#endif
|
||||
typedef __int64 os_off_t;
|
||||
#ifdef _WIN64
|
||||
typedef UINT_PTR rf_SetTimer;
|
||||
#else
|
||||
#ifndef HAVE_SIZE_T
|
||||
typedef unsigned int size_t;
|
||||
#endif
|
||||
typedef uint rf_SetTimer;
|
||||
#endif
|
||||
|
||||
|
|
|
@ -425,6 +425,8 @@ int __void__;
|
|||
#endif
|
||||
|
||||
#if defined(__EMX__) || !defined(HAVE_UINT)
|
||||
#undef HAVE_UINT
|
||||
#define HAVE_UINT
|
||||
typedef unsigned int uint;
|
||||
typedef unsigned short ushort;
|
||||
#endif
|
||||
|
|
|
@ -638,6 +638,7 @@ extern uint dirname_part(my_string to,const char *name);
|
|||
extern uint dirname_length(const char *name);
|
||||
#define base_name(A) (A+dirname_length(A))
|
||||
extern int test_if_hard_path(const char *dir_name);
|
||||
extern my_bool has_path(const char *name);
|
||||
extern char *convert_dirname(char *to, const char *from, const char *from_end);
|
||||
extern void to_unix_path(my_string name);
|
||||
extern my_string fn_ext(const char *name);
|
||||
|
|
|
@ -62,7 +62,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
|
|||
unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \
|
||||
spatial.cc gstream.cc sql_help.cc tztime.cc protocol_cursor.cc \
|
||||
sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
|
||||
parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
|
||||
parse_file.cc rpl_filter.cc sql_view.cc sql_trigger.cc my_decimal.cc \
|
||||
ha_blackhole.cc
|
||||
|
||||
libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)
|
||||
|
@ -73,9 +73,9 @@ sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
|
|||
|
||||
# The following libraries should be included in libmysqld.a
|
||||
INC_LIB= $(top_builddir)/regex/libregex.a \
|
||||
$(top_builddir)/myisam/libmyisam.a \
|
||||
$(top_builddir)/myisammrg/libmyisammrg.a \
|
||||
$(top_builddir)/heap/libheap.a \
|
||||
$(top_builddir)/storage/myisam/libmyisam.a \
|
||||
$(top_builddir)/storage/myisammrg/libmyisammrg.a \
|
||||
$(top_builddir)/storage/heap/libheap.a \
|
||||
@innodb_libs@ @bdb_libs_with_path@ \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/strings/libmystrings.a \
|
||||
|
|
|
@ -582,8 +582,8 @@ if [ x$SOURCE_DIST = x1 ] ; then
|
|||
CHARSETSDIR="$BASEDIR/sql/share/charsets"
|
||||
INSTALL_DB="./install_test_db"
|
||||
MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/scripts/mysql_fix_privilege_tables"
|
||||
NDB_TOOLS_DIR="$BASEDIR/ndb/tools"
|
||||
NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm"
|
||||
NDB_TOOLS_DIR="$BASEDIR/storage/ndb/tools"
|
||||
NDB_MGM="$BASEDIR/storage/ndb/src/mgmclient/ndb_mgm"
|
||||
|
||||
if [ -n "$USE_PURIFY" ] ; then
|
||||
PSUP="$MYSQL_TEST_DIR/purify.suppress"
|
||||
|
|
|
@ -18,7 +18,7 @@ cd $CWD
|
|||
# Are we using a source or a binary distribution?
|
||||
if [ -d ../sql ] ; then
|
||||
SOURCE_DIST=1
|
||||
ndbtop=$BASEDIR/ndb
|
||||
ndbtop=$BASEDIR/storage/ndb
|
||||
exec_ndb=$ndbtop/src/kernel/ndbd
|
||||
exec_mgmtsrvr=$ndbtop/src/mgmsrv/ndb_mgmd
|
||||
exec_waiter=$ndbtop/tools/ndb_waiter
|
||||
|
|
|
@ -192,6 +192,8 @@ select count(*) from t3;
|
|||
count(*)
|
||||
1199
|
||||
rename table t3 to t4;
|
||||
Warnings:
|
||||
Error 7 Error on rename of './test/t3.ARN' to './test/t4.ARN' (Errcode: 2)
|
||||
select * from t4 where fld3='bonfire';
|
||||
auto fld1 companynr fld3 fld4 fld5 fld6
|
||||
1191 068504 00 bonfire corresponds positively
|
||||
|
|
|
@ -128,3 +128,20 @@ t2.value64=t1.value64;
|
|||
value64 value32 value64 value32
|
||||
9223372036854775807 2 9223372036854775807 4
|
||||
drop table t1, t2;
|
||||
create table t1 select 1 as 'a';
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`a` bigint(1) NOT NULL default '0'
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
drop table t1;
|
||||
create table t1 select 9223372036854775809 as 'a';
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`a` bigint(19) unsigned NOT NULL default '0'
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
select * from t1;
|
||||
a
|
||||
9223372036854775809
|
||||
drop table t1;
|
||||
|
|
|
@ -4,12 +4,11 @@ CAST(1-2 AS UNSIGNED)
|
|||
select CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER);
|
||||
CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER)
|
||||
-1
|
||||
select CONVERT('-1',UNSIGNED);
|
||||
CONVERT('-1',UNSIGNED)
|
||||
18446744073709551615
|
||||
select CAST('10 ' as unsigned integer);
|
||||
CAST('10 ' as unsigned integer)
|
||||
10
|
||||
Warnings:
|
||||
Warning 1292 Truncated incorrect INTEGER value: '10 '
|
||||
select cast(-5 as unsigned) | 1, cast(-5 as unsigned) & -1;
|
||||
cast(-5 as unsigned) | 1 cast(-5 as unsigned) & -1
|
||||
18446744073709551611 18446744073709551611
|
||||
|
@ -100,6 +99,41 @@ select 10E+0+'a';
|
|||
10
|
||||
Warnings:
|
||||
Warning 1292 Truncated incorrect DOUBLE value: 'a'
|
||||
select cast('18446744073709551616' as unsigned);
|
||||
cast('18446744073709551616' as unsigned)
|
||||
18446744073709551615
|
||||
Warnings:
|
||||
Warning 1292 Truncated incorrect INTEGER value: '18446744073709551616'
|
||||
select cast('18446744073709551616' as signed);
|
||||
cast('18446744073709551616' as signed)
|
||||
-1
|
||||
Warnings:
|
||||
Warning 1292 Truncated incorrect INTEGER value: '18446744073709551616'
|
||||
select cast('9223372036854775809' as signed);
|
||||
cast('9223372036854775809' as signed)
|
||||
-9223372036854775807
|
||||
Warnings:
|
||||
Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement
|
||||
select cast('-1' as unsigned);
|
||||
cast('-1' as unsigned)
|
||||
18446744073709551615
|
||||
Warnings:
|
||||
Warning 1105 Cast to unsigned converted negative integer to it's positive complement
|
||||
select cast('abc' as signed);
|
||||
cast('abc' as signed)
|
||||
0
|
||||
Warnings:
|
||||
Warning 1292 Truncated incorrect INTEGER value: 'abc'
|
||||
select cast('1a' as signed);
|
||||
cast('1a' as signed)
|
||||
1
|
||||
Warnings:
|
||||
Warning 1292 Truncated incorrect INTEGER value: '1a'
|
||||
select cast('' as signed);
|
||||
cast('' as signed)
|
||||
0
|
||||
Warnings:
|
||||
Warning 1292 Truncated incorrect INTEGER value: ''
|
||||
set names binary;
|
||||
select cast(_latin1'test' as char character set latin2);
|
||||
cast(_latin1'test' as char character set latin2)
|
||||
|
@ -255,6 +289,39 @@ timediff(cast('2004-12-30 12:00:00' as time), '12:00:00')
|
|||
select timediff(cast('1 12:00:00' as time), '12:00:00');
|
||||
timediff(cast('1 12:00:00' as time), '12:00:00')
|
||||
24:00:00
|
||||
select cast(18446744073709551615 as unsigned);
|
||||
cast(18446744073709551615 as unsigned)
|
||||
18446744073709551615
|
||||
select cast(18446744073709551615 as signed);
|
||||
cast(18446744073709551615 as signed)
|
||||
-1
|
||||
select cast('18446744073709551615' as unsigned);
|
||||
cast('18446744073709551615' as unsigned)
|
||||
18446744073709551615
|
||||
select cast('18446744073709551615' as signed);
|
||||
cast('18446744073709551615' as signed)
|
||||
-1
|
||||
Warnings:
|
||||
Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement
|
||||
select cast('9223372036854775807' as signed);
|
||||
cast('9223372036854775807' as signed)
|
||||
9223372036854775807
|
||||
select cast(concat('184467440','73709551615') as unsigned);
|
||||
cast(concat('184467440','73709551615') as unsigned)
|
||||
18446744073709551615
|
||||
select cast(concat('184467440','73709551615') as signed);
|
||||
cast(concat('184467440','73709551615') as signed)
|
||||
-1
|
||||
Warnings:
|
||||
Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement
|
||||
select cast(repeat('1',20) as unsigned);
|
||||
cast(repeat('1',20) as unsigned)
|
||||
11111111111111111111
|
||||
select cast(repeat('1',20) as signed);
|
||||
cast(repeat('1',20) as signed)
|
||||
-7335632962598440505
|
||||
Warnings:
|
||||
Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement
|
||||
select cast('1.2' as decimal(3,2));
|
||||
cast('1.2' as decimal(3,2))
|
||||
1.20
|
||||
|
|
|
@ -801,5 +801,5 @@ CREATE TABLE t1 (st varchar(100));
|
|||
INSERT INTO t1 VALUES ("Fake string");
|
||||
CREATE TABLE t2 (geom GEOMETRY NOT NULL, SPATIAL KEY gk(geom));
|
||||
INSERT INTO t2 SELECT GeomFromText(st) FROM t1;
|
||||
ERROR HY000: Unknown error
|
||||
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
|
||||
drop table t1, t2;
|
||||
|
|
|
@ -461,9 +461,9 @@ Note 1003 select issimple(multipoint(point(3,6),point(4,10))) AS `issimple(Multi
|
|||
create table t1 (a geometry not null);
|
||||
insert into t1 values (GeomFromText('Point(1 2)'));
|
||||
insert into t1 values ('Garbage');
|
||||
ERROR HY000: Unknown error
|
||||
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
|
||||
insert IGNORE into t1 values ('Garbage');
|
||||
ERROR HY000: Unknown error
|
||||
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
|
||||
alter table t1 add spatial index(a);
|
||||
drop table t1;
|
||||
create table t1(a geometry not null, spatial index(a));
|
||||
|
@ -655,3 +655,13 @@ t1 where object_id=85984;
|
|||
object_id geometrytype(geo) ISSIMPLE(GEO) ASTEXT(centroid(geo))
|
||||
85984 MULTIPOLYGON 0 POINT(-114.87787186923 36.33101763469)
|
||||
drop table t1;
|
||||
create table t1 (fl geometry);
|
||||
insert into t1 values (1);
|
||||
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
|
||||
insert into t1 values (1.11);
|
||||
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
|
||||
insert into t1 values ("qwerty");
|
||||
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
|
||||
insert into t1 values (pointfromtext('point(1,1)'));
|
||||
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
|
||||
drop table t1;
|
||||
|
|
|
@ -702,3 +702,12 @@ c
|
|||
val-74
|
||||
val-98
|
||||
drop table t1,t2;
|
||||
create table t1 (b int4 unsigned not null);
|
||||
insert into t1 values(3000000000);
|
||||
select * from t1;
|
||||
b
|
||||
3000000000
|
||||
select min(b) from t1;
|
||||
min(b)
|
||||
3000000000
|
||||
drop table t1;
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
drop table if exists t1;
|
||||
create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb;
|
||||
select * from t1;
|
||||
c1 c2 stamp
|
||||
|
|
|
@ -13,6 +13,26 @@ a
|
|||
show status like 'handler_discover%';
|
||||
Variable_name Value
|
||||
Handler_discover 0
|
||||
select * from t1;
|
||||
a
|
||||
2
|
||||
drop table t1;
|
||||
create table t1 (a int) engine=ndbcluster;
|
||||
insert into t1 value (2);
|
||||
select * from t1;
|
||||
a
|
||||
2
|
||||
show status like 'handler_discover%';
|
||||
Variable_name Value
|
||||
Handler_discover 0
|
||||
drop table t1;
|
||||
create table t1 (a int) engine=ndbcluster;
|
||||
insert into t1 value (2);
|
||||
select * from t1;
|
||||
ERROR HY000: Got error 241 'Invalid schema object version' from ndbcluster
|
||||
select * from t1;
|
||||
a
|
||||
2
|
||||
flush status;
|
||||
select * from t1;
|
||||
a
|
||||
|
@ -20,7 +40,7 @@ a
|
|||
update t1 set a=3 where a=2;
|
||||
show status like 'handler_discover%';
|
||||
Variable_name Value
|
||||
Handler_discover 1
|
||||
Handler_discover 0
|
||||
create table t3 (a int not null primary key, b varchar(22),
|
||||
c int, last_col text) engine=ndb;
|
||||
insert into t3 values(1, 'Hi!', 89, 'Longtext column');
|
||||
|
|
|
@ -97,3 +97,29 @@ Variable_name Value
|
|||
Created_tmp_disk_tables 0
|
||||
Created_tmp_tables 2
|
||||
drop table t1;
|
||||
create temporary table t1 as select 'This is temp. table' A;
|
||||
create view t1 as select 'This is view' A;
|
||||
select * from t1;
|
||||
A
|
||||
This is temp. table
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TEMPORARY TABLE `t1` (
|
||||
`A` varchar(19) NOT NULL default ''
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
show create view t1;
|
||||
View Create View
|
||||
t1 CREATE ALGORITHM=UNDEFINED VIEW `test`.`t1` AS select _latin1'This is view' AS `A`
|
||||
drop view t1;
|
||||
select * from t1;
|
||||
A
|
||||
This is temp. table
|
||||
create view t1 as select 'This is view again' A;
|
||||
select * from t1;
|
||||
A
|
||||
This is temp. table
|
||||
drop table t1;
|
||||
select * from t1;
|
||||
A
|
||||
This is view again
|
||||
drop view t1;
|
||||
|
|
|
@ -764,3 +764,23 @@ non PS, 1.0 in parameter 1.0
|
|||
PS, 1.0 in parameter 1.0
|
||||
deallocate prepare stmt;
|
||||
drop table t1;
|
||||
create table t1 (
|
||||
strippedproductid char(15) not null default '',
|
||||
zlevelprice decimal(10,2) default null,
|
||||
primary key (strippedproductid)
|
||||
);
|
||||
create table t2 (
|
||||
productid char(15) not null default '',
|
||||
zlevelprice char(21) default null,
|
||||
primary key (productid)
|
||||
);
|
||||
insert into t1 values ('002trans','49.99');
|
||||
insert into t1 values ('003trans','39.98');
|
||||
insert into t1 values ('004trans','31.18');
|
||||
insert INTO t2 SELECT * FROM t1;
|
||||
select * from t2;
|
||||
productid zlevelprice
|
||||
002trans 49.99
|
||||
003trans 39.98
|
||||
004trans 31.18
|
||||
drop table t1, t2;
|
||||
|
|
|
@ -182,3 +182,44 @@ coercibility(@v1) coercibility(@v2) coercibility(@v3) coercibility(@v4)
|
|||
set session @honk=99;
|
||||
set one_shot @honk=99;
|
||||
ERROR HY000: The 'SET ONE_SHOT' syntax is reserved for purposes internal to the MySQL server
|
||||
set @first_var= NULL;
|
||||
create table t1 select @first_var;
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`@first_var` longblob
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
drop table t1;
|
||||
set @first_var= cast(NULL as signed integer);
|
||||
create table t1 select @first_var;
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`@first_var` bigint(20) default NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
drop table t1;
|
||||
set @first_var= NULL;
|
||||
create table t1 select @first_var;
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`@first_var` bigint(20) default NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
drop table t1;
|
||||
set @first_var= concat(NULL);
|
||||
create table t1 select @first_var;
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`@first_var` longblob
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
drop table t1;
|
||||
set @first_var=1;
|
||||
set @first_var= cast(NULL as CHAR);
|
||||
create table t1 select @first_var;
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`@first_var` longtext
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
drop table t1;
|
||||
|
|
|
@ -104,3 +104,13 @@ t2.value64=t1.value64;
|
|||
|
||||
drop table t1, t2;
|
||||
|
||||
#
|
||||
# Test of CREATE ... SELECT and unsigned integers
|
||||
#
|
||||
create table t1 select 1 as 'a';
|
||||
show create table t1;
|
||||
drop table t1;
|
||||
create table t1 select 9223372036854775809 as 'a';
|
||||
show create table t1;
|
||||
select * from t1;
|
||||
drop table t1;
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
select CAST(1-2 AS UNSIGNED);
|
||||
select CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER);
|
||||
select CONVERT('-1',UNSIGNED);
|
||||
select CAST('10 ' as unsigned integer);
|
||||
select cast(-5 as unsigned) | 1, cast(-5 as unsigned) & -1;
|
||||
select cast(-5 as unsigned) -1, cast(-5 as unsigned) + 1;
|
||||
|
@ -34,6 +33,15 @@ select 10+'a';
|
|||
select 10.0+cast('a' as decimal);
|
||||
select 10E+0+'a';
|
||||
|
||||
# out-of-range cases
|
||||
select cast('18446744073709551616' as unsigned);
|
||||
select cast('18446744073709551616' as signed);
|
||||
select cast('9223372036854775809' as signed);
|
||||
select cast('-1' as unsigned);
|
||||
select cast('abc' as signed);
|
||||
select cast('1a' as signed);
|
||||
select cast('' as signed);
|
||||
|
||||
#
|
||||
# Character set convertion
|
||||
#
|
||||
|
@ -132,6 +140,22 @@ select timediff(cast('2004-12-30 12:00:00' as time), '12:00:00');
|
|||
# Still we should not throw away "days" part of time value
|
||||
select timediff(cast('1 12:00:00' as time), '12:00:00');
|
||||
|
||||
#
|
||||
# Bug #7036: Casting from string to unsigned would cap value of result at
|
||||
# maximum signed value instead of maximum unsigned value
|
||||
#
|
||||
select cast(18446744073709551615 as unsigned);
|
||||
select cast(18446744073709551615 as signed);
|
||||
select cast('18446744073709551615' as unsigned);
|
||||
select cast('18446744073709551615' as signed);
|
||||
select cast('9223372036854775807' as signed);
|
||||
|
||||
select cast(concat('184467440','73709551615') as unsigned);
|
||||
select cast(concat('184467440','73709551615') as signed);
|
||||
|
||||
select cast(repeat('1',20) as unsigned);
|
||||
select cast(repeat('1',20) as signed);
|
||||
|
||||
#decimal-related additions
|
||||
select cast('1.2' as decimal(3,2));
|
||||
select 1e18 * cast('1.2' as decimal(3,2));
|
||||
|
|
|
@ -168,6 +168,6 @@ drop table t1;
|
|||
CREATE TABLE t1 (st varchar(100));
|
||||
INSERT INTO t1 VALUES ("Fake string");
|
||||
CREATE TABLE t2 (geom GEOMETRY NOT NULL, SPATIAL KEY gk(geom));
|
||||
--error 1105
|
||||
--error 1416
|
||||
INSERT INTO t2 SELECT GeomFromText(st) FROM t1;
|
||||
drop table t1, t2;
|
||||
|
|
|
@ -165,9 +165,9 @@ explain extended select issimple(MultiPoint(Point(3, 6), Point(4, 10))), issimpl
|
|||
|
||||
create table t1 (a geometry not null);
|
||||
insert into t1 values (GeomFromText('Point(1 2)'));
|
||||
-- error 1105
|
||||
-- error 1416
|
||||
insert into t1 values ('Garbage');
|
||||
-- error 1105
|
||||
-- error 1416
|
||||
insert IGNORE into t1 values ('Garbage');
|
||||
alter table t1 add spatial index(a);
|
||||
|
||||
|
@ -359,3 +359,15 @@ select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
|
|||
t1 where object_id=85984;
|
||||
|
||||
drop table t1;
|
||||
|
||||
create table t1 (fl geometry);
|
||||
--error 1416
|
||||
insert into t1 values (1);
|
||||
--error 1416
|
||||
insert into t1 values (1.11);
|
||||
--error 1416
|
||||
insert into t1 values ("qwerty");
|
||||
--error 1416
|
||||
insert into t1 values (pointfromtext('point(1,1)'));
|
||||
|
||||
drop table t1;
|
||||
|
|
|
@ -515,3 +515,10 @@ explain select c from t2 where a = 2 and b = 'val-2' group by c;
|
|||
select c from t2 where a = 2 and b = 'val-2' group by c;
|
||||
drop table t1,t2;
|
||||
|
||||
# Test for BUG#9298 "Wrong handling of int4 unsigned columns in GROUP functions"
|
||||
# (the actual problem was with protocol code, not GROUP BY)
|
||||
create table t1 (b int4 unsigned not null);
|
||||
insert into t1 values(3000000000);
|
||||
select * from t1;
|
||||
select min(b) from t1;
|
||||
drop table t1;
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
# embedded server ignores 'delayed', so skip this
|
||||
-- source include/not_embedded.inc
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1;
|
||||
--enable_warnings
|
||||
|
||||
#
|
||||
# Bug #1078
|
||||
#
|
||||
|
|
|
@ -18,6 +18,30 @@ select * from t1;
|
|||
select * from t2;
|
||||
show status like 'handler_discover%';
|
||||
|
||||
# Check dropping and recreating table on same server
|
||||
connect (con1,localhost,,,test);
|
||||
connect (con2,localhost,,,test);
|
||||
connection con1;
|
||||
select * from t1;
|
||||
connection con2;
|
||||
drop table t1;
|
||||
create table t1 (a int) engine=ndbcluster;
|
||||
insert into t1 value (2);
|
||||
connection con1;
|
||||
select * from t1;
|
||||
|
||||
# Check dropping and recreating table on different server
|
||||
connection server2;
|
||||
show status like 'handler_discover%';
|
||||
drop table t1;
|
||||
create table t1 (a int) engine=ndbcluster;
|
||||
insert into t1 value (2);
|
||||
connection server1;
|
||||
# Currently a retry is required remotely
|
||||
--error 1296
|
||||
select * from t1;
|
||||
select * from t1;
|
||||
|
||||
# Connect to server2 and use the tables from there
|
||||
connection server2;
|
||||
flush status;
|
||||
|
|
|
@ -89,3 +89,18 @@ flush status;
|
|||
select * from t1 group by d;
|
||||
show status like "created_tmp%tables";
|
||||
drop table t1;
|
||||
|
||||
# Fix for BUG#8921: Check that temporary table is ingored by view commands.
|
||||
create temporary table t1 as select 'This is temp. table' A;
|
||||
create view t1 as select 'This is view' A;
|
||||
select * from t1;
|
||||
show create table t1;
|
||||
show create view t1;
|
||||
drop view t1;
|
||||
select * from t1;
|
||||
create view t1 as select 'This is view again' A;
|
||||
select * from t1;
|
||||
drop table t1;
|
||||
select * from t1;
|
||||
drop view t1;
|
||||
|
||||
|
|
|
@ -343,3 +343,31 @@ execute stmt using @a;
|
|||
select * from t1;
|
||||
deallocate prepare stmt;
|
||||
drop table t1;
|
||||
|
||||
#
|
||||
# A test case for Bug#5673 "Rounding problem in 4.0.21 inserting decimal
|
||||
# value into a char field": this is a regression bug in 4.0 tree caused by
|
||||
# a fix for some other decimal conversion issue. The patch never was
|
||||
# approved to get into 4.0 (maybe because it was considered too intrusive)
|
||||
#
|
||||
|
||||
create table t1 (
|
||||
strippedproductid char(15) not null default '',
|
||||
zlevelprice decimal(10,2) default null,
|
||||
primary key (strippedproductid)
|
||||
);
|
||||
|
||||
create table t2 (
|
||||
productid char(15) not null default '',
|
||||
zlevelprice char(21) default null,
|
||||
primary key (productid)
|
||||
);
|
||||
|
||||
insert into t1 values ('002trans','49.99');
|
||||
insert into t1 values ('003trans','39.98');
|
||||
insert into t1 values ('004trans','31.18');
|
||||
|
||||
insert INTO t2 SELECT * FROM t1;
|
||||
|
||||
select * from t2;
|
||||
drop table t1, t2;
|
||||
|
|
|
@ -119,3 +119,29 @@ select coercibility(@v1),coercibility(@v2),coercibility(@v3),coercibility(@v4);
|
|||
set session @honk=99;
|
||||
--error 1382
|
||||
set one_shot @honk=99;
|
||||
|
||||
#
|
||||
# Bug #6598: problem with cast(NULL as signed integer);
|
||||
#
|
||||
|
||||
set @first_var= NULL;
|
||||
create table t1 select @first_var;
|
||||
show create table t1;
|
||||
drop table t1;
|
||||
set @first_var= cast(NULL as signed integer);
|
||||
create table t1 select @first_var;
|
||||
show create table t1;
|
||||
drop table t1;
|
||||
set @first_var= NULL;
|
||||
create table t1 select @first_var;
|
||||
show create table t1;
|
||||
drop table t1;
|
||||
set @first_var= concat(NULL);
|
||||
create table t1 select @first_var;
|
||||
show create table t1;
|
||||
drop table t1;
|
||||
set @first_var=1;
|
||||
set @first_var= cast(NULL as CHAR);
|
||||
create table t1 select @first_var;
|
||||
show create table t1;
|
||||
drop table t1;
|
||||
|
|
135
mysys/default.c
135
mysys/default.c
|
@ -409,6 +409,56 @@ static int search_default_file(Process_option_func opt_handler,
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
Skip over keyword and get argument after keyword
|
||||
|
||||
SYNOPSIS
|
||||
get_argument()
|
||||
keyword Include directive keyword
|
||||
kwlen Length of keyword
|
||||
ptr Pointer to the keword in the line under process
|
||||
line line number
|
||||
|
||||
RETURN
|
||||
0 error
|
||||
# Returns pointer to the argument after the keyword.
|
||||
*/
|
||||
|
||||
static char *get_argument(const char *keyword, uint kwlen,
|
||||
char *ptr, char *name, uint line)
|
||||
{
|
||||
char *end;
|
||||
|
||||
/* Skip over "include / includedir keyword" and following whitespace */
|
||||
|
||||
for (ptr+= kwlen - 1;
|
||||
my_isspace(&my_charset_latin1, ptr[0]);
|
||||
ptr++)
|
||||
{}
|
||||
|
||||
/*
|
||||
Trim trailing whitespace from directory name
|
||||
The -1 below is for the newline added by fgets()
|
||||
Note that my_isspace() is true for \r and \n
|
||||
*/
|
||||
for (end= ptr + strlen(ptr) - 1;
|
||||
my_isspace(&my_charset_latin1, *(end - 1));
|
||||
end--)
|
||||
{}
|
||||
end[0]= 0; /* Cut off end space */
|
||||
|
||||
/* Print error msg if there is nothing after !include* directive */
|
||||
if (end <= ptr)
|
||||
{
|
||||
fprintf(stderr,
|
||||
"error: Wrong '!%s' directive in config file: %s at line %d\n",
|
||||
keyword, name, line);
|
||||
return 0;
|
||||
}
|
||||
return ptr;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Open a configuration file (if exists) and read given options from it
|
||||
|
||||
|
@ -497,40 +547,34 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
|
|||
continue;
|
||||
|
||||
/* Configuration File Directives */
|
||||
if ((*ptr == '!') && (recursion_level < max_recursion_level))
|
||||
if ((*ptr == '!'))
|
||||
{
|
||||
if (recursion_level >= max_recursion_level)
|
||||
{
|
||||
for (end= ptr + strlen(ptr) - 1;
|
||||
my_isspace(&my_charset_latin1, *(end - 1));
|
||||
end--)
|
||||
{}
|
||||
end[0]= 0;
|
||||
fprintf(stderr,
|
||||
"Warning: skipping '%s' directive as maximum include"
|
||||
"recursion level was reached in file %s at line %d\n",
|
||||
ptr, name, line);
|
||||
continue;
|
||||
}
|
||||
|
||||
/* skip over `!' and following whitespace */
|
||||
for (++ptr; my_isspace(&my_charset_latin1, ptr[0]); ptr++)
|
||||
{}
|
||||
|
||||
if ((!strncmp(ptr, includedir_keyword, sizeof(includedir_keyword) - 1))
|
||||
&& my_isspace(&my_charset_latin1, ptr[sizeof(includedir_keyword) - 1]))
|
||||
if ((!strncmp(ptr, includedir_keyword,
|
||||
sizeof(includedir_keyword) - 1)) &&
|
||||
my_isspace(&my_charset_latin1, ptr[sizeof(includedir_keyword) - 1]))
|
||||
{
|
||||
/* skip over "includedir" and following whitespace */
|
||||
for (ptr+= sizeof(includedir_keyword) - 1;
|
||||
my_isspace(&my_charset_latin1, ptr[0]); ptr++)
|
||||
{}
|
||||
|
||||
/* trim trailing whitespace from directory name */
|
||||
end= ptr + strlen(ptr) - 1;
|
||||
/* fgets() stores the newline character in the buffer */
|
||||
if ((end[0] == '\n') || (end[0] == '\r') ||
|
||||
my_isspace(&my_charset_latin1, end[0]))
|
||||
{
|
||||
for (; my_isspace(&my_charset_latin1, *(end - 1)); end--)
|
||||
{}
|
||||
end[0]= 0;
|
||||
}
|
||||
|
||||
/* print error msg if there is nothing after !includedir directive */
|
||||
if (end == ptr)
|
||||
{
|
||||
fprintf(stderr,
|
||||
"error: Wrong !includedir directive in config "
|
||||
"file: %s at line %d\n",
|
||||
name,line);
|
||||
goto err;
|
||||
}
|
||||
if (!(ptr= get_argument(includedir_keyword,
|
||||
sizeof(includedir_keyword),
|
||||
ptr, name, line)))
|
||||
goto err;
|
||||
|
||||
if (!(search_dir= my_dir(ptr, MYF(MY_WME))))
|
||||
goto err;
|
||||
|
@ -559,28 +603,13 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
|
|||
|
||||
my_dirend(search_dir);
|
||||
}
|
||||
else if ((!strncmp(ptr, include_keyword, sizeof(include_keyword) - 1))
|
||||
&& my_isspace(&my_charset_latin1, ptr[sizeof(include_keyword) - 1]))
|
||||
else if ((!strncmp(ptr, include_keyword, sizeof(include_keyword) - 1)) &&
|
||||
my_isspace(&my_charset_latin1, ptr[sizeof(include_keyword)-1]))
|
||||
{
|
||||
/* skip over `include' and following whitespace */
|
||||
for (ptr+= sizeof(include_keyword) - 1;
|
||||
my_isspace(&my_charset_latin1, ptr[0]); ptr++)
|
||||
{}
|
||||
|
||||
/* trim trailing whitespace from filename */
|
||||
end= ptr + strlen(ptr) - 1;
|
||||
for (; my_isspace(&my_charset_latin1, *(end - 1)) ; end--)
|
||||
{}
|
||||
end[0]= 0;
|
||||
|
||||
if (end == ptr)
|
||||
{
|
||||
fprintf(stderr,
|
||||
"error: Wrong !include directive in config "
|
||||
"file: %s at line %d\n",
|
||||
name,line);
|
||||
goto err;
|
||||
}
|
||||
if (!(ptr= get_argument(include_keyword,
|
||||
sizeof(include_keyword), ptr,
|
||||
name, line)))
|
||||
goto err;
|
||||
|
||||
search_default_file_with_ext(opt_handler, handler_ctx, "", "", ptr,
|
||||
recursion_level + 1);
|
||||
|
@ -588,14 +617,6 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
|
|||
|
||||
continue;
|
||||
}
|
||||
else
|
||||
if (recursion_level >= max_recursion_level)
|
||||
{
|
||||
fprintf(stderr,
|
||||
"warning: skipping !include directive as maximum include"
|
||||
"recursion level was reached in file %s at line %d\n",
|
||||
name, line);
|
||||
}
|
||||
|
||||
if (*ptr == '[') /* Group name */
|
||||
{
|
||||
|
|
|
@ -1025,8 +1025,8 @@ static void reg_requests(KEY_CACHE *keycache, BLOCK_LINK *block, int count)
|
|||
for a too long time (this time is determined by parameter age_threshold).
|
||||
*/
|
||||
|
||||
static inline void unreg_request(KEY_CACHE *keycache,
|
||||
BLOCK_LINK *block, int at_end)
|
||||
static void unreg_request(KEY_CACHE *keycache,
|
||||
BLOCK_LINK *block, int at_end)
|
||||
{
|
||||
if (! --block->requests)
|
||||
{
|
||||
|
@ -1045,10 +1045,13 @@ static inline void unreg_request(KEY_CACHE *keycache,
|
|||
}
|
||||
link_block(keycache, block, hot, (my_bool)at_end);
|
||||
block->last_hit_time= keycache->keycache_time;
|
||||
if (++keycache->keycache_time - keycache->used_ins->last_hit_time >
|
||||
keycache->keycache_time++;
|
||||
|
||||
block= keycache->used_ins;
|
||||
/* Check if we should link a hot block to the warm block */
|
||||
if (block && keycache->keycache_time - block->last_hit_time >
|
||||
keycache->age_threshold)
|
||||
{
|
||||
block= keycache->used_ins;
|
||||
unlink_block(keycache, block);
|
||||
link_block(keycache, block, 0, 0);
|
||||
if (block->temperature != BLOCK_WARM)
|
||||
|
|
|
@ -192,3 +192,25 @@ int test_if_hard_path(register const char *dir_name)
|
|||
return FALSE;
|
||||
#endif
|
||||
} /* test_if_hard_path */
|
||||
|
||||
|
||||
/*
|
||||
Test if a name contains an (absolute or relative) path.
|
||||
|
||||
SYNOPSIS
|
||||
has_path()
|
||||
name The name to test.
|
||||
|
||||
RETURN
|
||||
TRUE name contains a path.
|
||||
FALSE name does not contain a path.
|
||||
*/
|
||||
|
||||
my_bool has_path(const char *name)
|
||||
{
|
||||
return test(strchr(name, FN_LIBCHAR))
|
||||
#ifdef FN_DEVCHAR
|
||||
|| test(strchr(name, FN_DEVCHAR))
|
||||
#endif
|
||||
;
|
||||
}
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
|
||||
INCLUDES += \
|
||||
-I$(srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/src/kernel/vm \
|
||||
-I$(top_srcdir)/ndb/src/kernel/error \
|
||||
-I$(top_srcdir)/ndb/src/kernel \
|
||||
-I$(top_srcdir)/ndb/include/kernel \
|
||||
-I$(top_srcdir)/ndb/include/transporter \
|
||||
-I$(top_srcdir)/ndb/include/debugger \
|
||||
-I$(top_srcdir)/ndb/include/mgmapi \
|
||||
-I$(top_srcdir)/ndb/include/mgmcommon \
|
||||
-I$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/include/logger
|
||||
|
||||
#AM_LDFLAGS = @ndb_ldflags@
|
|
@ -1,2 +0,0 @@
|
|||
|
||||
INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi
|
|
@ -1,12 +0,0 @@
|
|||
|
||||
INCLUDES += \
|
||||
-I$(srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/include/kernel \
|
||||
-I$(top_srcdir)/ndb/include/transporter \
|
||||
-I$(top_srcdir)/ndb/include/debugger \
|
||||
-I$(top_srcdir)/ndb/include/mgmapi \
|
||||
-I$(top_srcdir)/ndb/include/mgmcommon \
|
||||
-I$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/include/logger
|
|
@ -1,2 +0,0 @@
|
|||
|
||||
INCLUDES += -I$(top_srcdir)/ndb/include/ndbapi
|
|
@ -1,14 +0,0 @@
|
|||
|
||||
LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \
|
||||
$(top_builddir)/ndb/src/libndbclient.la \
|
||||
$(top_builddir)/dbug/libdbug.a \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
|
||||
|
||||
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/test/include \
|
||||
-I$(top_srcdir)/ndb/include/mgmapi
|
|
@ -1,15 +0,0 @@
|
|||
|
||||
LDADD += \
|
||||
$(top_builddir)/ndb/src/libndbclient.la \
|
||||
$(top_builddir)/dbug/libdbug.a \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
|
||||
|
||||
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/test/include \
|
||||
-I$(top_srcdir)/ndb/include/mgmapi \
|
||||
-I$(top_srcdir)/ndb/include/kernel
|
|
@ -1,6 +0,0 @@
|
|||
|
||||
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/include/logger
|
|
@ -1,33 +0,0 @@
|
|||
SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
|
||||
ndblib_LTLIBRARIES = libndbclient.la
|
||||
|
||||
libndbclient_la_SOURCES =
|
||||
|
||||
libndbclient_la_LIBADD = \
|
||||
ndbapi/libndbapi.la \
|
||||
common/transporter/libtransporter.la \
|
||||
common/debugger/libtrace.la \
|
||||
common/debugger/signaldata/libsignaldataprint.la \
|
||||
mgmapi/libmgmapi.la \
|
||||
common/mgmcommon/libmgmsrvcommon.la \
|
||||
common/logger/liblogger.la \
|
||||
common/portlib/libportlib.la \
|
||||
common/util/libgeneral.la
|
||||
|
||||
windoze-dsp: libndbclient.dsp
|
||||
|
||||
libndbclient.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(ndblib_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ dummy.cpp
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
|
||||
@touch dummy.cpp
|
|
@ -1,25 +0,0 @@
|
|||
SUBDIRS = signaldata
|
||||
|
||||
noinst_LTLIBRARIES = libtrace.la
|
||||
|
||||
libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp EventLogger.cpp GrepError.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libtrace.dsp
|
||||
|
||||
libtrace.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libtrace_la_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,25 +0,0 @@
|
|||
|
||||
noinst_LTLIBRARIES = liblogger.la
|
||||
|
||||
SOURCE_WIN = Logger.cpp LogHandlerList.cpp LogHandler.cpp \
|
||||
ConsoleLogHandler.cpp FileLogHandler.cpp
|
||||
liblogger_la_SOURCES = $(SOURCE_WIN) SysLogHandler.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
windoze-dsp: liblogger.dsp
|
||||
|
||||
liblogger.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(SOURCE_WIN)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,28 +0,0 @@
|
|||
noinst_LTLIBRARIES = libmgmsrvcommon.la
|
||||
|
||||
libmgmsrvcommon_la_SOURCES = \
|
||||
ConfigRetriever.cpp \
|
||||
IPCConfig.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/src/mgmsrv
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libmgmsrvcommon.dsp
|
||||
|
||||
libmgmsrvcommon.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libmgmsrvcommon_la_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,36 +0,0 @@
|
|||
|
||||
noinst_LTLIBRARIES = libtransporter.la
|
||||
|
||||
libtransporter_la_SOURCES = \
|
||||
Transporter.cpp \
|
||||
SendBuffer.cpp \
|
||||
TCP_Transporter.cpp \
|
||||
TransporterRegistry.cpp \
|
||||
Packer.cpp
|
||||
|
||||
EXTRA_libtransporter_la_SOURCES = SHM_Transporter.cpp SHM_Transporter.unix.cpp SCI_Transporter.cpp
|
||||
|
||||
libtransporter_la_LIBADD = @ndb_transporter_opt_objs@
|
||||
libtransporter_la_DEPENDENCIES = @ndb_transporter_opt_objs@
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/include/debugger -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter @NDB_SCI_INCLUDES@
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_util.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libtransporter.dsp
|
||||
|
||||
libtransporter.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libtransporter_la_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,24 +0,0 @@
|
|||
|
||||
noinst_LIBRARIES = libbackup.a
|
||||
|
||||
libbackup_a_SOURCES = Backup.cpp BackupInit.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libbackup.dsp
|
||||
|
||||
libbackup.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libbackup_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,24 +0,0 @@
|
|||
|
||||
noinst_LIBRARIES = libcmvmi.a
|
||||
|
||||
libcmvmi_a_SOURCES = Cmvmi.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libcmvmi.dsp
|
||||
|
||||
libcmvmi.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libcmvmi_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,26 +0,0 @@
|
|||
|
||||
noinst_LIBRARIES = libdbacc.a
|
||||
|
||||
libdbacc_a_SOURCES = DbaccInit.cpp DbaccMain.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/kernel/blocks/dbtup
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbacc.dsp
|
||||
|
||||
libdbacc.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbacc_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,25 +0,0 @@
|
|||
#SUBDIRS = printSchemafile
|
||||
|
||||
noinst_LIBRARIES = libdbdict.a
|
||||
|
||||
libdbdict_a_SOURCES = Dbdict.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbdict.dsp
|
||||
|
||||
libdbdict.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbdict_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,23 +0,0 @@
|
|||
noinst_LIBRARIES = libdbdih.a
|
||||
|
||||
libdbdih_a_SOURCES = DbdihInit.cpp DbdihMain.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbdih.dsp
|
||||
|
||||
libdbdih.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbdih_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,25 +0,0 @@
|
|||
#SUBDIRS = redoLogReader
|
||||
|
||||
noinst_LIBRARIES = libdblqh.a
|
||||
|
||||
libdblqh_a_SOURCES = DblqhInit.cpp DblqhMain.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdblqh.dsp
|
||||
|
||||
libdblqh.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdblqh_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,23 +0,0 @@
|
|||
noinst_LIBRARIES = libdbtc.a
|
||||
|
||||
libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbtc.dsp
|
||||
|
||||
libdbtc.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbtc_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,42 +0,0 @@
|
|||
noinst_LIBRARIES = libdbtup.a
|
||||
|
||||
libdbtup_a_SOURCES = \
|
||||
DbtupExecQuery.cpp \
|
||||
DbtupBuffer.cpp \
|
||||
DbtupRoutines.cpp \
|
||||
DbtupCommit.cpp \
|
||||
DbtupFixAlloc.cpp \
|
||||
DbtupTrigger.cpp \
|
||||
DbtupAbort.cpp \
|
||||
DbtupLCP.cpp \
|
||||
DbtupUndoLog.cpp \
|
||||
DbtupPageMap.cpp \
|
||||
DbtupPagMan.cpp \
|
||||
DbtupStoredProcDef.cpp \
|
||||
DbtupMeta.cpp \
|
||||
DbtupTabDesMan.cpp \
|
||||
DbtupGen.cpp \
|
||||
DbtupSystemRestart.cpp \
|
||||
DbtupIndex.cpp \
|
||||
DbtupScan.cpp \
|
||||
DbtupDebug.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbtup.dsp
|
||||
|
||||
libdbtup.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbtup_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,34 +0,0 @@
|
|||
noinst_LIBRARIES = libdbtux.a
|
||||
|
||||
libdbtux_a_SOURCES = \
|
||||
DbtuxGen.cpp \
|
||||
DbtuxMeta.cpp \
|
||||
DbtuxMaint.cpp \
|
||||
DbtuxNode.cpp \
|
||||
DbtuxTree.cpp \
|
||||
DbtuxScan.cpp \
|
||||
DbtuxSearch.cpp \
|
||||
DbtuxCmp.cpp \
|
||||
DbtuxDebug.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/kernel/blocks/dbtup
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbtux.dsp
|
||||
|
||||
libdbtux.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbtux_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,23 +0,0 @@
|
|||
noinst_LIBRARIES = libdbutil.a
|
||||
|
||||
libdbutil_a_SOURCES = DbUtil.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbutil.dsp
|
||||
|
||||
libdbutil.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbutil_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,23 +0,0 @@
|
|||
noinst_LIBRARIES = libgrep.a
|
||||
|
||||
libgrep_a_SOURCES = Grep.cpp GrepInit.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libgrep.dsp
|
||||
|
||||
libgrep.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libgrep_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,26 +0,0 @@
|
|||
noinst_LIBRARIES = libndbcntr.a
|
||||
|
||||
libndbcntr_a_SOURCES = \
|
||||
NdbcntrInit.cpp \
|
||||
NdbcntrSysTable.cpp \
|
||||
NdbcntrMain.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libndbcntr.dsp
|
||||
|
||||
libndbcntr.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libndbcntr_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,27 +0,0 @@
|
|||
noinst_LIBRARIES = libndbfs.a
|
||||
|
||||
libndbfs_a_SOURCES = \
|
||||
AsyncFile.cpp \
|
||||
Ndbfs.cpp VoidFs.cpp \
|
||||
Filename.cpp \
|
||||
CircularIndex.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libndbfs.dsp
|
||||
|
||||
libndbfs.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libndbfs_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,25 +0,0 @@
|
|||
noinst_LIBRARIES = libqmgr.a
|
||||
|
||||
libqmgr_a_SOURCES = \
|
||||
QmgrInit.cpp \
|
||||
QmgrMain.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libqmgr.dsp
|
||||
|
||||
libqmgr.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libqmgr_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,23 +0,0 @@
|
|||
noinst_LIBRARIES = libsuma.a
|
||||
|
||||
libsuma_a_SOURCES = Suma.cpp SumaInit.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libsuma.dsp
|
||||
|
||||
libsuma.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libsuma_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,23 +0,0 @@
|
|||
noinst_LIBRARIES = libtrix.a
|
||||
|
||||
libtrix_a_SOURCES = Trix.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libtrix.dsp
|
||||
|
||||
libtrix.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libtrix_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,25 +0,0 @@
|
|||
noinst_LIBRARIES = liberror.a
|
||||
|
||||
liberror_a_SOURCES = TimeModule.cpp \
|
||||
ErrorReporter.cpp \
|
||||
ErrorMessages.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: liberror.dsp
|
||||
|
||||
liberror.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(liberror_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,44 +0,0 @@
|
|||
#SUBDIRS = testCopy testDataBuffer testSimplePropertiesSection
|
||||
#ifneq ($(USE_EDITLINE), N)
|
||||
#DIRS += testLongSig
|
||||
#endif
|
||||
|
||||
noinst_LIBRARIES = libkernel.a
|
||||
|
||||
libkernel_a_SOURCES = \
|
||||
SimulatedBlock.cpp \
|
||||
FastScheduler.cpp \
|
||||
TimeQueue.cpp \
|
||||
VMSignal.cpp \
|
||||
ThreadConfig.cpp \
|
||||
TransporterCallback.cpp \
|
||||
Emulator.cpp \
|
||||
Configuration.cpp \
|
||||
WatchDog.cpp \
|
||||
SimplePropertiesSection.cpp \
|
||||
SectionReader.cpp \
|
||||
MetaData.cpp \
|
||||
Mutex.cpp SafeCounter.cpp \
|
||||
SuperPool.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libkernel.dsp
|
||||
|
||||
libkernel.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,30 +0,0 @@
|
|||
|
||||
noinst_LTLIBRARIES = libmgmapi.la
|
||||
|
||||
libmgmapi_la_SOURCES = mgmapi.cpp ndb_logevent.cpp mgmapi_configuration.cpp LocalConfig.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi
|
||||
|
||||
DEFS_LOC = -DNO_DEBUG_MESSAGES -DNDB_PORT="\"@ndb_port@\""
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_util.mk.am
|
||||
|
||||
#ndbtest_PROGRAMS = ndb_test_mgmapi
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libmgmapi.dsp
|
||||
|
||||
libmgmapi.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libmgmapi_la_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
|
@ -1,58 +0,0 @@
|
|||
|
||||
noinst_LTLIBRARIES = libndbmgmclient.la
|
||||
ndbtools_PROGRAMS = ndb_mgm
|
||||
|
||||
libndbmgmclient_la_SOURCES = CommandInterpreter.cpp
|
||||
libndbmgmclient_la_LIBADD = ../mgmapi/libmgmapi.la \
|
||||
../common/logger/liblogger.la \
|
||||
../common/portlib/libportlib.la \
|
||||
../common/util/libgeneral.la \
|
||||
../common/portlib/libportlib.la
|
||||
|
||||
|
||||
ndb_mgm_SOURCES = main.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
||||
|
||||
INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi \
|
||||
-I$(top_srcdir)/ndb/src/common/mgmcommon
|
||||
|
||||
LDADD_LOC = $(noinst_LTLIBRARIES) \
|
||||
../common/portlib/libportlib.la \
|
||||
@readline_link@ \
|
||||
$(top_builddir)/dbug/libdbug.a \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/strings/libmystrings.a \
|
||||
@TERMCAP_LIB@ @NDB_SCI_LIBS@
|
||||
|
||||
ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp
|
||||
|
||||
ndb_mgm.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(ndbtools_PROGRAMS)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_mgm_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
libndbmgmclient.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB
|
|
@ -1,60 +0,0 @@
|
|||
MYSQLDATAdir = $(localstatedir)
|
||||
MYSQLSHAREdir = $(pkgdatadir)
|
||||
MYSQLBASEdir= $(prefix)
|
||||
#MYSQLCLUSTERdir= $(prefix)/mysql-cluster
|
||||
MYSQLCLUSTERdir= .
|
||||
|
||||
ndbbin_PROGRAMS = ndb_mgmd
|
||||
|
||||
ndb_mgmd_SOURCES = \
|
||||
MgmtSrvr.cpp \
|
||||
MgmtSrvrGeneralSignalHandling.cpp \
|
||||
main.cpp \
|
||||
Services.cpp \
|
||||
convertStrToInt.cpp \
|
||||
SignalQueue.cpp \
|
||||
MgmtSrvrConfig.cpp \
|
||||
ConfigInfo.cpp \
|
||||
InitConfigFileParser.cpp \
|
||||
Config.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi \
|
||||
-I$(top_srcdir)/ndb/src/mgmapi \
|
||||
-I$(top_srcdir)/ndb/src/common/mgmcommon \
|
||||
-I$(top_srcdir)/ndb/src/mgmclient
|
||||
|
||||
LDADD_LOC = $(top_srcdir)/ndb/src/mgmclient/CommandInterpreter.o \
|
||||
$(top_builddir)/ndb/src/libndbclient.la \
|
||||
$(top_builddir)/dbug/libdbug.a \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/strings/libmystrings.a \
|
||||
@readline_link@ \
|
||||
@NDB_SCI_LIBS@ \
|
||||
@TERMCAP_LIB@
|
||||
|
||||
DEFS_LOC = -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
|
||||
-DDATADIR="\"$(MYSQLDATAdir)\"" \
|
||||
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
|
||||
-DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\""
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
||||
|
||||
ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: ndb_mgmd.dsp
|
||||
|
||||
ndb_mgmd.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
|
@ -1,159 +0,0 @@
|
|||
|
||||
SUBDIRS = bank
|
||||
|
||||
ndbtest_PROGRAMS = \
|
||||
flexBench \
|
||||
drop_all_tabs \
|
||||
create_all_tabs \
|
||||
create_tab \
|
||||
flexAsynch \
|
||||
flexBench \
|
||||
flexHammer \
|
||||
flexTT \
|
||||
testBackup \
|
||||
testBasic \
|
||||
testBasicAsynch \
|
||||
testBlobs \
|
||||
testDataBuffers \
|
||||
testDict \
|
||||
testIndex \
|
||||
testMgm \
|
||||
testNdbApi \
|
||||
testNodeRestart \
|
||||
testOIBasic \
|
||||
testOperations \
|
||||
testRestartGci \
|
||||
testScan \
|
||||
testScanInterpreter \
|
||||
testScanPerf \
|
||||
testSystemRestart \
|
||||
testTimeout \
|
||||
testTransactions \
|
||||
testDeadlock \
|
||||
test_event ndbapi_slow_select testReadPerf testLcp \
|
||||
testPartitioning \
|
||||
testBitfield \
|
||||
DbCreate DbAsyncGenerator \
|
||||
test_event_multi_table
|
||||
|
||||
#flexTimedAsynch
|
||||
#testBlobs
|
||||
#flex_bench_mysql
|
||||
|
||||
create_all_tabs_SOURCES = create_all_tabs.cpp
|
||||
create_tab_SOURCES = create_tab.cpp
|
||||
drop_all_tabs_SOURCES = drop_all_tabs.cpp
|
||||
flexAsynch_SOURCES = flexAsynch.cpp
|
||||
flexBench_SOURCES = flexBench.cpp
|
||||
flexHammer_SOURCES = flexHammer.cpp
|
||||
flexTT_SOURCES = flexTT.cpp
|
||||
#flexTimedAsynch_SOURCES = flexTimedAsynch.cpp
|
||||
#flex_bench_mysql_SOURCES = flex_bench_mysql.cpp
|
||||
testBackup_SOURCES = testBackup.cpp
|
||||
testBasic_SOURCES = testBasic.cpp
|
||||
testBasicAsynch_SOURCES = testBasicAsynch.cpp
|
||||
testBlobs_SOURCES = testBlobs.cpp
|
||||
testDataBuffers_SOURCES = testDataBuffers.cpp
|
||||
testDict_SOURCES = testDict.cpp
|
||||
testIndex_SOURCES = testIndex.cpp
|
||||
testMgm_SOURCES = testMgm.cpp
|
||||
testNdbApi_SOURCES = testNdbApi.cpp
|
||||
testNodeRestart_SOURCES = testNodeRestart.cpp
|
||||
testOIBasic_SOURCES = testOIBasic.cpp
|
||||
testOperations_SOURCES = testOperations.cpp
|
||||
testRestartGci_SOURCES = testRestartGci.cpp
|
||||
testScan_SOURCES = testScan.cpp ScanFunctions.hpp
|
||||
testScanInterpreter_SOURCES = testScanInterpreter.cpp ScanFilter.hpp ScanInterpretTest.hpp
|
||||
testScanPerf_SOURCES = testScanPerf.cpp
|
||||
testSystemRestart_SOURCES = testSystemRestart.cpp
|
||||
testTimeout_SOURCES = testTimeout.cpp
|
||||
testTransactions_SOURCES = testTransactions.cpp
|
||||
testDeadlock_SOURCES = testDeadlock.cpp
|
||||
test_event_SOURCES = test_event.cpp
|
||||
ndbapi_slow_select_SOURCES = slow_select.cpp
|
||||
testReadPerf_SOURCES = testReadPerf.cpp
|
||||
testLcp_SOURCES = testLcp.cpp
|
||||
testPartitioning_SOURCES = testPartitioning.cpp
|
||||
testBitfield_SOURCES = testBitfield.cpp
|
||||
DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
|
||||
DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
|
||||
test_event_multi_table_SOURCES = test_event_multi_table.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
|
||||
|
||||
##testDict_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
|
||||
##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
|
||||
##testSystemRestart_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
|
||||
##testTransactions_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
|
||||
testBackup_LDADD = $(LDADD) bank/libbank.a
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
|
||||
|
||||
windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \
|
||||
testScan.dsp
|
||||
|
||||
flexBench.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ flexBench
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(flexBench_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
testBasic.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ testBasic
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(testBasic_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
testOIBasic.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ testOIBasic
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(testOIBasic_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
testBlobs.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ testBlobs
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(testBlobs_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
testScan.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ testScan
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(testScan_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
|
@ -1,35 +0,0 @@
|
|||
|
||||
noinst_LIBRARIES = libNDBT.a
|
||||
|
||||
libNDBT_a_SOURCES = \
|
||||
NDBT_ReturnCodes.cpp \
|
||||
NDBT_Error.cpp NDBT_Tables.cpp NDBT_ResultRow.cpp \
|
||||
NDBT_Test.cpp HugoCalculator.cpp \
|
||||
HugoOperations.cpp HugoTransactions.cpp \
|
||||
HugoAsynchTransactions.cpp UtilTransactions.cpp \
|
||||
NdbRestarter.cpp NdbRestarts.cpp NDBT_Output.cpp \
|
||||
NdbBackup.cpp NdbConfig.cpp NdbGrep.cpp NDBT_Table.cpp \
|
||||
NdbSchemaCon.cpp NdbSchemaOp.cpp getarg.c \
|
||||
CpcClient.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/common/mgmcommon -I$(top_srcdir)/ndb/include/mgmcommon -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/src/mgmapi
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libNDBT.dsp
|
||||
|
||||
libNDBT.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libNDBT_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB
|
|
@ -1,156 +0,0 @@
|
|||
|
||||
ndbtools_PROGRAMS = \
|
||||
ndb_test_platform \
|
||||
ndb_waiter \
|
||||
ndb_drop_table \
|
||||
ndb_delete_all \
|
||||
ndb_desc \
|
||||
ndb_drop_index \
|
||||
ndb_show_tables \
|
||||
ndb_select_all \
|
||||
ndb_select_count \
|
||||
ndb_restore
|
||||
|
||||
tools_common_sources = ../test/src/NDBT_ReturnCodes.cpp \
|
||||
../test/src/NDBT_Table.cpp \
|
||||
../test/src/NDBT_Output.cpp
|
||||
|
||||
ndb_test_platform_SOURCES = ndb_test_platform.cpp
|
||||
ndb_waiter_SOURCES = waiter.cpp $(tools_common_sources)
|
||||
ndb_delete_all_SOURCES = delete_all.cpp $(tools_common_sources)
|
||||
ndb_desc_SOURCES = desc.cpp $(tools_common_sources)
|
||||
ndb_drop_index_SOURCES = drop_index.cpp $(tools_common_sources)
|
||||
ndb_drop_table_SOURCES = drop_tab.cpp $(tools_common_sources)
|
||||
ndb_show_tables_SOURCES = listTables.cpp $(tools_common_sources)
|
||||
ndb_select_all_SOURCES = select_all.cpp \
|
||||
../test/src/NDBT_ResultRow.cpp \
|
||||
$(tools_common_sources)
|
||||
ndb_select_count_SOURCES = select_count.cpp $(tools_common_sources)
|
||||
ndb_restore_SOURCES = restore/restore_main.cpp \
|
||||
restore/consumer.cpp \
|
||||
restore/consumer_restore.cpp \
|
||||
restore/consumer_printer.cpp \
|
||||
restore/Restore.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapitools.mk.am
|
||||
|
||||
ndb_test_platform_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_waiter_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_drop_table_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_delete_all_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_desc_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_drop_index_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_show_tables_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_select_all_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_select_count_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_restore_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: \
|
||||
ndb_waiter.dsp \
|
||||
ndb_drop_table.dsp \
|
||||
ndb_delete_all.dsp \
|
||||
ndb_desc.dsp \
|
||||
ndb_drop_index.dsp \
|
||||
ndb_show_tables.dsp \
|
||||
ndb_select_all.dsp \
|
||||
ndb_select_count.dsp
|
||||
|
||||
ndb_waiter.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_waiter
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_waiter_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_drop_table.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_drop_table
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_drop_table_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_delete_all.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_delete_all
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_delete_all_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_desc.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_desc
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_desc_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_drop_index.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_drop_index
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_drop_index_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_show_tables.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_show_tables
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_show_tables_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_select_all.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_select_all
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_select_all_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_select_count.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_select_count
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_select_count_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
|
@ -1,5 +1,5 @@
|
|||
-- This script converts any old privilege tables to privilege tables suitable
|
||||
-- for MySQL 4.0.
|
||||
-- for this version of MySQL
|
||||
|
||||
-- You can safely ignore all 'Duplicate column' and 'Unknown column' errors"
|
||||
-- because these just mean that your tables are already up to date.
|
||||
|
@ -119,7 +119,6 @@ UPDATE user SET Show_db_priv= Select_priv, Super_priv=Process_priv, Execute_priv
|
|||
|
||||
-- Add fields that can be used to limit number of questions and connections
|
||||
-- for some users.
|
||||
|
||||
ALTER TABLE user
|
||||
ADD max_questions int(11) NOT NULL DEFAULT 0 AFTER x509_subject,
|
||||
ADD max_updates int(11) unsigned NOT NULL DEFAULT 0 AFTER max_questions,
|
||||
|
@ -134,8 +133,8 @@ ALTER TABLE db
|
|||
ADD Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
|
||||
ADD Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
|
||||
ALTER TABLE host
|
||||
ADD Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
|
||||
ADD Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
|
||||
ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,
|
||||
ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
|
||||
|
||||
alter table user change max_questions max_questions int(11) unsigned DEFAULT 0 NOT NULL;
|
||||
alter table tables_priv add KEY Grantor (Grantor);
|
||||
|
|
|
@ -29,9 +29,9 @@ libexec_PROGRAMS = mysqld
|
|||
noinst_PROGRAMS = gen_lex_hash
|
||||
bin_PROGRAMS = mysql_tzinfo_to_sql
|
||||
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
|
||||
LDADD = $(top_builddir)/myisam/libmyisam.a \
|
||||
$(top_builddir)/myisammrg/libmyisammrg.a \
|
||||
$(top_builddir)/heap/libheap.a \
|
||||
LDADD = $(top_builddir)/storage/myisam/libmyisam.a \
|
||||
$(top_builddir)/storage/myisammrg/libmyisammrg.a \
|
||||
$(top_builddir)/storage/heap/libheap.a \
|
||||
$(top_builddir)/vio/libvio.a \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/dbug/libdbug.a \
|
||||
|
@ -55,7 +55,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
|
|||
ha_ndbcluster.h opt_range.h protocol.h \
|
||||
sql_select.h structs.h table.h sql_udf.h hash_filo.h\
|
||||
lex.h lex_symbol.h sql_acl.h sql_crypt.h \
|
||||
log_event.h sql_repl.h slave.h \
|
||||
log_event.h sql_repl.h slave.h rpl_filter.h \
|
||||
stacktrace.h sql_sort.h sql_cache.h set_var.h \
|
||||
spatial.h gstream.h client_settings.h tzfile.h \
|
||||
tztime.h my_decimal.h\
|
||||
|
@ -89,7 +89,8 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \
|
|||
sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
|
||||
sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
|
||||
sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
|
||||
slave.cc sql_repl.cc sql_union.cc sql_derived.cc \
|
||||
slave.cc sql_repl.cc rpl_filter.cc \
|
||||
sql_union.cc sql_derived.cc \
|
||||
client.c sql_client.cc mini_client_errors.c pack.c\
|
||||
stacktrace.c repl_failsafe.h repl_failsafe.cc \
|
||||
sql_olap.cc sql_view.cc \
|
||||
|
|
254
sql/bitvector.h
Normal file
254
sql/bitvector.h
Normal file
|
@ -0,0 +1,254 @@
|
|||
/* -*- Mode: C++ -*-
|
||||
|
||||
Copyright (C) 2005 MySQL AB
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||
|
||||
#ifndef BITVECTOR_H
|
||||
#define BITVECTOR_H
|
||||
|
||||
#include <my_global.h>
|
||||
#include <my_sys.h>
|
||||
#include <cstring>
|
||||
#include <climits>
|
||||
|
||||
/* Some compile-time checks to ensure the integrity of the implementation. */
|
||||
#if CHAR_BIT != 8
|
||||
# error "This implementation is designed for 8-bit bytes!"
|
||||
#endif
|
||||
|
||||
#ifndef __cplusplus
|
||||
# error "This is not a C header file, it's a C++ header file"
|
||||
#endif
|
||||
|
||||
namespace
|
||||
{
|
||||
/* Defining my own swap, since we cannot use std::swap() */
|
||||
template <class T>
|
||||
inline void my_swap(T& x, T& y)
|
||||
{
|
||||
T t(x); x= y; y= t;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
A run-time sized bitvector for storing bits.
|
||||
|
||||
|
||||
CAVEAT
|
||||
|
||||
This class is not designed to be inherited from, please don't do that.
|
||||
|
||||
Right now, the vector cannot change size. It's only used as a replacement
|
||||
for using an array of bytes and a counter. If you want to change the size
|
||||
of the vector, construct a new bitvector and assign it to the vector,
|
||||
e.g.:
|
||||
|
||||
bitvector new_bv(new_size);
|
||||
old_bv= new_bv;
|
||||
|
||||
An alternative is to use the swap member function to replace the instance:
|
||||
|
||||
bitvector new_bv(new_size);
|
||||
old_bv.swap(new_bv);
|
||||
|
||||
The latter may be more efficient on compilers that are not so good at
|
||||
inlining code.
|
||||
*/
|
||||
|
||||
class bitvector
|
||||
{
|
||||
private:
|
||||
/* Helper classes */
|
||||
struct flip_bit_op
|
||||
{
|
||||
void operator()(byte* p, byte m) { *p^= m; }
|
||||
};
|
||||
|
||||
struct set_bit_op
|
||||
{
|
||||
void operator()(byte* p, byte m) { *p|= m; }
|
||||
};
|
||||
|
||||
struct clear_bit_op
|
||||
{
|
||||
void operator()(byte* p, byte m) { *p&= ~m; }
|
||||
};
|
||||
|
||||
struct test_bit_op
|
||||
{
|
||||
bool operator()(byte* p, byte m) { return *p & m; }
|
||||
};
|
||||
|
||||
/* Compute the number of bytes required to store 'bits' bits in an array. */
|
||||
static inline size_t byte_size(size_t bits)
|
||||
{
|
||||
int const byte_bits = sizeof(byte) * CHAR_BIT;
|
||||
return (bits + (byte_bits-1)) / byte_bits;
|
||||
}
|
||||
|
||||
/* Tidy the last byte (by clearing the unused bits) of the bitvector to make
|
||||
* comparison easy. This code is assuming that we're working with 8-bit
|
||||
* bytes.
|
||||
*/
|
||||
void tidy_last_byte()
|
||||
{
|
||||
byte* const last_byte= m_data + bytes() - 1;
|
||||
|
||||
/* Get the number of used bits (1..8) in the last byte */
|
||||
unsigned int const used= 1U + ((size()-1U) & 0x7U);
|
||||
|
||||
/* Create a mask with the upper 'unused' bits clear and the lower 'used'
|
||||
* bits set. The bits within each byte is stored in big-endian order.
|
||||
*/
|
||||
unsigned int const mask= ((1 << used) - 1);
|
||||
|
||||
/* Mask the last byte */
|
||||
*last_byte&= mask;
|
||||
}
|
||||
|
||||
template <class ReturnType, class Func>
|
||||
inline ReturnType apply_to_byte(size_t const pos, Func op) const
|
||||
{
|
||||
/* Here I'm assuming that we're working with 8-bit bytes. */
|
||||
ptrdiff_t const byte_pos= pos >> 3;
|
||||
byte const mask= (1 << (pos & 0x7U));
|
||||
return op(&m_data[byte_pos], mask);
|
||||
}
|
||||
|
||||
public:
|
||||
bitvector()
|
||||
: m_size(0), m_data(0)
|
||||
{
|
||||
}
|
||||
|
||||
explicit bitvector(size_t size, bool value= false)
|
||||
: m_size(size), m_data(my_malloc(byte_size(size), MYF(0)))
|
||||
{
|
||||
if (value)
|
||||
set_all();
|
||||
else
|
||||
clear_all();
|
||||
}
|
||||
|
||||
/* Constructor to create a bitvector from data. Observe that 'size' is the
|
||||
* number of *bits* in the bitvector.
|
||||
*/
|
||||
explicit bitvector(byte const* data, size_t size)
|
||||
: m_size(size), m_data(my_malloc(byte_size(size), MYF(0)))
|
||||
{
|
||||
/* std::copy(data, data + byte_size(size), m_data); */
|
||||
memcpy(m_data, data, byte_size(size));
|
||||
tidy_last_byte();
|
||||
}
|
||||
|
||||
bitvector(bitvector const& other)
|
||||
: m_size(other.size()), m_data(my_malloc(other.bytes(), MYF(0)))
|
||||
{
|
||||
/* std::copy(other.m_data, other.m_data + other.bytes(), m_data); */
|
||||
memcpy(m_data, other.data(), other.bytes());
|
||||
tidy_last_byte(); /* Just a precaution */
|
||||
}
|
||||
|
||||
/* Assignment operator */
|
||||
bitvector& operator=(bitvector other)
|
||||
{
|
||||
swap(other);
|
||||
return *this;
|
||||
}
|
||||
|
||||
~bitvector()
|
||||
{
|
||||
if (m_data)
|
||||
my_free(m_data, MYF(0));
|
||||
}
|
||||
|
||||
/* Swap the guts of this instance with another instance. */
|
||||
void swap(bitvector& other)
|
||||
{
|
||||
my_swap(m_size, other.m_size);
|
||||
my_swap(m_data, other.m_data);
|
||||
}
|
||||
|
||||
/* A pointer to the bytes representing the bits */
|
||||
byte const *data() const { return m_data; }
|
||||
|
||||
/* The size of the data in *bytes* */
|
||||
size_t bytes() const { return byte_size(m_size); }
|
||||
|
||||
/* The number of bits in the bit vector */
|
||||
size_t size() const { return m_size; }
|
||||
|
||||
/* Set all bits in the vector */
|
||||
void set_all()
|
||||
{
|
||||
/* std::fill_n(m_data, bytes(), 255); */
|
||||
memset(m_data, 255, bytes());
|
||||
tidy_last_byte();
|
||||
}
|
||||
|
||||
/* Set a bit to a value */
|
||||
void set_bit(size_t pos)
|
||||
{
|
||||
apply_to_byte<void>(pos, set_bit_op());
|
||||
}
|
||||
|
||||
/* Reset (clear) all bits in the vector */
|
||||
void clear_all()
|
||||
{
|
||||
/* std::fill_n(m_data, bytes(), 0); */
|
||||
memset(m_data, 0, bytes());
|
||||
tidy_last_byte();
|
||||
}
|
||||
|
||||
/* Reset one bit in the vector */
|
||||
void clear_bit(size_t pos)
|
||||
{
|
||||
apply_to_byte<void>(pos, clear_bit_op());
|
||||
}
|
||||
|
||||
void flip_bit(size_t pos)
|
||||
{
|
||||
apply_to_byte<void>(pos, flip_bit_op());
|
||||
}
|
||||
|
||||
bool get_bit(size_t pos) const
|
||||
{
|
||||
return apply_to_byte<bool>(pos, test_bit_op());
|
||||
};
|
||||
|
||||
bool operator==(bitvector const& rhs) const
|
||||
{
|
||||
if (size() != rhs.size())
|
||||
return false;
|
||||
/* This works since I have ensured that the last byte of the array contain
|
||||
* sensible data.
|
||||
*/
|
||||
if (memcmp(data(), rhs.data(), bytes()) != 0)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool operator!=(bitvector const& rhs) const
|
||||
{
|
||||
return !(*this == rhs);
|
||||
}
|
||||
|
||||
private:
|
||||
size_t m_size;
|
||||
byte *m_data;
|
||||
};
|
||||
|
||||
#endif /* BITVECTOR_H */
|
|
@ -447,35 +447,6 @@ const char **ha_archive::bas_ext() const
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
Rename all files that this handler defines in bas_ext list
|
||||
|
||||
NOTE Don't care if the .arn file is missing
|
||||
*/
|
||||
int ha_archive::rename_table(const char * from, const char * to)
|
||||
{
|
||||
DBUG_ENTER("ha_archive::rename_table");
|
||||
DBUG_PRINT("enter", ("from: %s, to: %s", from, to));
|
||||
for (const char **ext=bas_ext(); *ext ; ext++)
|
||||
{
|
||||
// Check if the .arn file exists before rename
|
||||
if (!my_strcasecmp(system_charset_info, *ext, ARN))
|
||||
{
|
||||
char name[FN_REFLEN];
|
||||
(void)strxnmov(name, FN_REFLEN, from, ARN, NullS);
|
||||
if (access(name, F_OK))
|
||||
{
|
||||
DBUG_PRINT("info", ("%s does not exist on disk, skipping it", name));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (rename_file_ext(from,to,*ext))
|
||||
DBUG_RETURN(my_errno);
|
||||
}
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
When opening a file we:
|
||||
Create/get our shared structure.
|
||||
|
|
|
@ -104,7 +104,6 @@ public:
|
|||
int end_bulk_insert();
|
||||
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
|
||||
enum thr_lock_type lock_type);
|
||||
int rename_table(const char * from, const char * to);
|
||||
};
|
||||
|
||||
handlerton *archive_db_init(void);
|
||||
|
|
30
sql/field.cc
30
sql/field.cc
|
@ -7267,12 +7267,38 @@ void Field_geom::sql_type(String &res) const
|
|||
}
|
||||
|
||||
|
||||
int Field_geom::store(double nr)
|
||||
{
|
||||
my_message(ER_CANT_CREATE_GEOMETRY_OBJECT,
|
||||
ER(ER_CANT_CREATE_GEOMETRY_OBJECT), MYF(0));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int Field_geom::store(longlong nr)
|
||||
{
|
||||
my_message(ER_CANT_CREATE_GEOMETRY_OBJECT,
|
||||
ER(ER_CANT_CREATE_GEOMETRY_OBJECT), MYF(0));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int Field_geom::store_decimal(const my_decimal *)
|
||||
{
|
||||
my_message(ER_CANT_CREATE_GEOMETRY_OBJECT,
|
||||
ER(ER_CANT_CREATE_GEOMETRY_OBJECT), MYF(0));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs)
|
||||
{
|
||||
if (!length)
|
||||
bzero(ptr, Field_blob::pack_length());
|
||||
else
|
||||
{
|
||||
if (from == Geometry::bad_geometry_data.ptr())
|
||||
goto err;
|
||||
// Check given WKB
|
||||
uint32 wkb_type;
|
||||
if (length < SRID_SIZE + WKB_HEADER_SIZE + SIZEOF_STORED_DOUBLE*2)
|
||||
|
@ -7280,7 +7306,7 @@ int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs)
|
|||
wkb_type= uint4korr(from + WKB_HEADER_SIZE);
|
||||
if (wkb_type < (uint32) Geometry::wkb_point ||
|
||||
wkb_type > (uint32) Geometry::wkb_end)
|
||||
return -1;
|
||||
goto err;
|
||||
Field_blob::store_length(length);
|
||||
if (table->copy_blobs || length <= MAX_FIELD_WIDTH)
|
||||
{ // Must make a copy
|
||||
|
@ -7293,6 +7319,8 @@ int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs)
|
|||
|
||||
err:
|
||||
bzero(ptr, Field_blob::pack_length());
|
||||
my_message(ER_CANT_CREATE_GEOMETRY_OBJECT,
|
||||
ER(ER_CANT_CREATE_GEOMETRY_OBJECT), MYF(0));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
@ -118,6 +118,7 @@ public:
|
|||
String *val_int_as_str(String *val_buffer, my_bool unsigned_flag);
|
||||
virtual Item_result result_type () const=0;
|
||||
virtual Item_result cmp_type () const { return result_type(); }
|
||||
virtual Item_result cast_to_int_type () const { return result_type(); }
|
||||
static enum_field_types field_type_merge(enum_field_types, enum_field_types);
|
||||
static Item_result result_merge_type(enum_field_types);
|
||||
bool eq(Field *field)
|
||||
|
@ -1189,9 +1190,9 @@ public:
|
|||
enum_field_types type() const { return FIELD_TYPE_GEOMETRY; }
|
||||
void sql_type(String &str) const;
|
||||
int store(const char *to, uint length, CHARSET_INFO *charset);
|
||||
int store(double nr) { return 1; }
|
||||
int store(longlong nr) { return 1; }
|
||||
int store_decimal(const my_decimal *) { return 1; }
|
||||
int store(double nr);
|
||||
int store(longlong nr);
|
||||
int store_decimal(const my_decimal *);
|
||||
void get_key_image(char *buff,uint length,imagetype type);
|
||||
};
|
||||
#endif /*HAVE_SPATIAL*/
|
||||
|
@ -1216,6 +1217,7 @@ public:
|
|||
}
|
||||
enum_field_types type() const { return FIELD_TYPE_STRING; }
|
||||
enum Item_result cmp_type () const { return INT_RESULT; }
|
||||
enum Item_result cast_to_int_type () const { return INT_RESULT; }
|
||||
enum ha_base_keytype key_type() const;
|
||||
int store(const char *to,uint length,CHARSET_INFO *charset);
|
||||
int store(double nr);
|
||||
|
|
|
@ -107,28 +107,28 @@ typedef byte mysql_byte;
|
|||
|
||||
/* Include necessary InnoDB headers */
|
||||
extern "C" {
|
||||
#include "../innobase/include/univ.i"
|
||||
#include "../innobase/include/os0file.h"
|
||||
#include "../innobase/include/os0thread.h"
|
||||
#include "../innobase/include/srv0start.h"
|
||||
#include "../innobase/include/srv0srv.h"
|
||||
#include "../innobase/include/trx0roll.h"
|
||||
#include "../innobase/include/trx0trx.h"
|
||||
#include "../innobase/include/trx0sys.h"
|
||||
#include "../innobase/include/mtr0mtr.h"
|
||||
#include "../innobase/include/row0ins.h"
|
||||
#include "../innobase/include/row0mysql.h"
|
||||
#include "../innobase/include/row0sel.h"
|
||||
#include "../innobase/include/row0upd.h"
|
||||
#include "../innobase/include/log0log.h"
|
||||
#include "../innobase/include/lock0lock.h"
|
||||
#include "../innobase/include/dict0crea.h"
|
||||
#include "../innobase/include/btr0cur.h"
|
||||
#include "../innobase/include/btr0btr.h"
|
||||
#include "../innobase/include/fsp0fsp.h"
|
||||
#include "../innobase/include/sync0sync.h"
|
||||
#include "../innobase/include/fil0fil.h"
|
||||
#include "../innobase/include/trx0xa.h"
|
||||
#include "../storage/innobase/include/univ.i"
|
||||
#include "../storage/innobase/include/os0file.h"
|
||||
#include "../storage/innobase/include/os0thread.h"
|
||||
#include "../storage/innobase/include/srv0start.h"
|
||||
#include "../storage/innobase/include/srv0srv.h"
|
||||
#include "../storage/innobase/include/trx0roll.h"
|
||||
#include "../storage/innobase/include/trx0trx.h"
|
||||
#include "../storage/innobase/include/trx0sys.h"
|
||||
#include "../storage/innobase/include/mtr0mtr.h"
|
||||
#include "../storage/innobase/include/row0ins.h"
|
||||
#include "../storage/innobase/include/row0mysql.h"
|
||||
#include "../storage/innobase/include/row0sel.h"
|
||||
#include "../storage/innobase/include/row0upd.h"
|
||||
#include "../storage/innobase/include/log0log.h"
|
||||
#include "../storage/innobase/include/lock0lock.h"
|
||||
#include "../storage/innobase/include/dict0crea.h"
|
||||
#include "../storage/innobase/include/btr0cur.h"
|
||||
#include "../storage/innobase/include/btr0btr.h"
|
||||
#include "../storage/innobase/include/fsp0fsp.h"
|
||||
#include "../storage/innobase/include/sync0sync.h"
|
||||
#include "../storage/innobase/include/fil0fil.h"
|
||||
#include "../storage/innobase/include/trx0xa.h"
|
||||
}
|
||||
|
||||
#define HA_INNOBASE_ROWS_IN_TABLE 10000 /* to get optimization right */
|
||||
|
@ -1632,7 +1632,7 @@ innobase_report_binlog_offset_and_commit(
|
|||
#endif /* HAVE_REPLICATION */
|
||||
trx->flush_log_later = TRUE;
|
||||
|
||||
innobase_commit(thd, trx_handle);
|
||||
innobase_commit(thd, TRUE);
|
||||
|
||||
trx->flush_log_later = FALSE;
|
||||
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
#ifndef MASTER
|
||||
#include "../srclib/myisam/myisamdef.h"
|
||||
#else
|
||||
#include "../myisam/myisamdef.h"
|
||||
#include "../myisam/rt_index.h"
|
||||
#include "../storage/myisam/myisamdef.h"
|
||||
#include "../storage/myisam/rt_index.h"
|
||||
#endif
|
||||
|
||||
ulong myisam_recover_options= HA_RECOVER_NONE;
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#ifndef MASTER
|
||||
#include "../srclib/myisammrg/myrg_def.h"
|
||||
#else
|
||||
#include "../myisammrg/myrg_def.h"
|
||||
#include "../storage/myisammrg/myrg_def.h"
|
||||
#endif
|
||||
|
||||
/*****************************************************************************
|
||||
|
@ -400,6 +400,7 @@ int ha_myisammrg::create(const char *name, register TABLE *form,
|
|||
const char **table_names, **pos;
|
||||
TABLE_LIST *tables= (TABLE_LIST*) create_info->merge_list.first;
|
||||
THD *thd= current_thd;
|
||||
uint dirlgt= dirname_length(name);
|
||||
DBUG_ENTER("ha_myisammrg::create");
|
||||
|
||||
if (!(table_names= (const char**)
|
||||
|
@ -413,11 +414,30 @@ int ha_myisammrg::create(const char *name, register TABLE *form,
|
|||
tbl= find_temporary_table(thd, tables->db, tables->table_name);
|
||||
if (!tbl)
|
||||
{
|
||||
uint length= my_snprintf(buff,FN_REFLEN,"%s%s/%s",
|
||||
mysql_real_data_home,
|
||||
/*
|
||||
Construct the path to the MyISAM table. Try to meet two conditions:
|
||||
1.) Allow to include MyISAM tables from different databases, and
|
||||
2.) allow for moving DATADIR around in the file system.
|
||||
The first means that we need paths in the .MRG file. The second
|
||||
means that we should not have absolute paths in the .MRG file.
|
||||
The best, we can do, is to use 'mysql_data_home', which is '.'
|
||||
in mysqld and may be an absolute path in an embedded server.
|
||||
This means that it might not be possible to move the DATADIR of
|
||||
an embedded server without changing the paths in the .MRG file.
|
||||
*/
|
||||
uint length= my_snprintf(buff, FN_REFLEN, "%s/%s/%s", mysql_data_home,
|
||||
tables->db, tables->table_name);
|
||||
if (!(table_name= thd->strmake(buff, length)))
|
||||
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
|
||||
/*
|
||||
If a MyISAM table is in the same directory as the MERGE table,
|
||||
we use the table name without a path. This means that the
|
||||
DATADIR can easily be moved even for an embedded server as long
|
||||
as the MyISAM tables are from the same database as the MERGE table.
|
||||
*/
|
||||
if ((dirname_length(buff) == dirlgt) && ! memcmp(buff, name, dirlgt))
|
||||
table_name= tables->table_name;
|
||||
else
|
||||
if (! (table_name= thd->strmake(buff, length)))
|
||||
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
|
||||
}
|
||||
else
|
||||
table_name= (*tbl)->s->path;
|
||||
|
|
|
@ -418,11 +418,28 @@ void ha_ndbcluster::no_uncommitted_rows_reset(THD *thd)
|
|||
# The mapped error code
|
||||
*/
|
||||
|
||||
void ha_ndbcluster::invalidateDictionaryCache()
|
||||
void ha_ndbcluster::invalidate_dictionary_cache(bool global)
|
||||
{
|
||||
NDBDICT *dict= get_ndb()->getDictionary();
|
||||
DBUG_ENTER("invalidate_dictionary_cache");
|
||||
DBUG_PRINT("info", ("invalidating %s", m_tabname));
|
||||
dict->invalidateTable(m_tabname);
|
||||
|
||||
if (global)
|
||||
{
|
||||
const NDBTAB *tab= dict->getTable(m_tabname);
|
||||
if (!tab)
|
||||
DBUG_VOID_RETURN;
|
||||
if (tab->getObjectStatus() == NdbDictionary::Object::Invalid)
|
||||
{
|
||||
// Global cache has already been invalidated
|
||||
dict->removeCachedTable(m_tabname);
|
||||
global= FALSE;
|
||||
}
|
||||
else
|
||||
dict->invalidateTable(m_tabname);
|
||||
}
|
||||
else
|
||||
dict->removeCachedTable(m_tabname);
|
||||
table->s->version=0L; /* Free when thread is ready */
|
||||
/* Invalidate indexes */
|
||||
for (uint i= 0; i < table->s->keys; i++)
|
||||
|
@ -434,18 +451,28 @@ void ha_ndbcluster::invalidateDictionaryCache()
|
|||
switch(idx_type) {
|
||||
case(PRIMARY_KEY_ORDERED_INDEX):
|
||||
case(ORDERED_INDEX):
|
||||
dict->invalidateIndex(index->getName(), m_tabname);
|
||||
if (global)
|
||||
dict->invalidateIndex(index->getName(), m_tabname);
|
||||
else
|
||||
dict->removeCachedIndex(index->getName(), m_tabname);
|
||||
break;
|
||||
case(UNIQUE_ORDERED_INDEX):
|
||||
dict->invalidateIndex(index->getName(), m_tabname);
|
||||
if (global)
|
||||
dict->invalidateIndex(index->getName(), m_tabname);
|
||||
else
|
||||
dict->removeCachedIndex(index->getName(), m_tabname);
|
||||
case(UNIQUE_INDEX):
|
||||
dict->invalidateIndex(unique_index->getName(), m_tabname);
|
||||
if (global)
|
||||
dict->invalidateIndex(unique_index->getName(), m_tabname);
|
||||
else
|
||||
dict->removeCachedIndex(unique_index->getName(), m_tabname);
|
||||
break;
|
||||
case(PRIMARY_KEY_INDEX):
|
||||
case(UNDEFINED_INDEX):
|
||||
break;
|
||||
}
|
||||
}
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
int ha_ndbcluster::ndb_err(NdbTransaction *trans)
|
||||
|
@ -457,7 +484,7 @@ int ha_ndbcluster::ndb_err(NdbTransaction *trans)
|
|||
ERR_PRINT(err);
|
||||
switch (err.classification) {
|
||||
case NdbError::SchemaError:
|
||||
invalidateDictionaryCache();
|
||||
invalidate_dictionary_cache(TRUE);
|
||||
|
||||
if (err.code==284)
|
||||
{
|
||||
|
@ -882,7 +909,14 @@ int ha_ndbcluster::get_metadata(const char *path)
|
|||
|
||||
if (!(tab= dict->getTable(m_tabname)))
|
||||
ERR_RETURN(dict->getNdbError());
|
||||
DBUG_PRINT("info", ("Table schema version: %d", tab->getObjectVersion()));
|
||||
// Check if thread has stale local cache
|
||||
if (tab->getObjectStatus() == NdbDictionary::Object::Invalid)
|
||||
{
|
||||
invalidate_dictionary_cache(FALSE);
|
||||
if (!(tab= dict->getTable(m_tabname)))
|
||||
ERR_RETURN(dict->getNdbError());
|
||||
DBUG_PRINT("info", ("Table schema version: %d", tab->getObjectVersion()));
|
||||
}
|
||||
/*
|
||||
Compare FrmData in NDB with frm file from disk.
|
||||
*/
|
||||
|
@ -901,7 +935,7 @@ int ha_ndbcluster::get_metadata(const char *path)
|
|||
if (!invalidating_ndb_table)
|
||||
{
|
||||
DBUG_PRINT("info", ("Invalidating table"));
|
||||
invalidateDictionaryCache();
|
||||
invalidate_dictionary_cache(TRUE);
|
||||
invalidating_ndb_table= TRUE;
|
||||
}
|
||||
else
|
||||
|
@ -927,7 +961,7 @@ int ha_ndbcluster::get_metadata(const char *path)
|
|||
if (error)
|
||||
DBUG_RETURN(error);
|
||||
|
||||
m_tableVersion= tab->getObjectVersion();
|
||||
m_table_version= tab->getObjectVersion();
|
||||
m_table= (void *)tab;
|
||||
m_table_info= NULL; // Set in external lock
|
||||
|
||||
|
@ -3269,15 +3303,25 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
|
|||
void *tab_info;
|
||||
if (!(tab= dict->getTable(m_tabname, &tab_info)))
|
||||
ERR_RETURN(dict->getNdbError());
|
||||
DBUG_PRINT("info", ("Table schema version: %d", tab->getObjectVersion()));
|
||||
if (m_table != (void *)tab || m_tableVersion != tab->getObjectVersion())
|
||||
DBUG_PRINT("info", ("Table schema version: %d",
|
||||
tab->getObjectVersion()));
|
||||
// Check if thread has stale local cache
|
||||
if (tab->getObjectStatus() == NdbDictionary::Object::Invalid)
|
||||
{
|
||||
invalidate_dictionary_cache(FALSE);
|
||||
if (!(tab= dict->getTable(m_tabname, &tab_info)))
|
||||
ERR_RETURN(dict->getNdbError());
|
||||
DBUG_PRINT("info", ("Table schema version: %d",
|
||||
tab->getObjectVersion()));
|
||||
}
|
||||
if (m_table != (void *)tab || m_table_version < tab->getObjectVersion())
|
||||
{
|
||||
/*
|
||||
The table has been altered, refresh the index list
|
||||
*/
|
||||
build_index_list(ndb, table, ILBP_OPEN);
|
||||
m_table= (void *)tab;
|
||||
m_tableVersion = tab->getObjectVersion();
|
||||
m_table_version = tab->getObjectVersion();
|
||||
}
|
||||
m_table_info= tab_info;
|
||||
}
|
||||
|
@ -3321,7 +3365,6 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
|
|||
thd_ndb->stmt= NULL;
|
||||
}
|
||||
}
|
||||
m_table= NULL;
|
||||
m_table_info= NULL;
|
||||
|
||||
/*
|
||||
|
@ -4036,7 +4079,13 @@ int ha_ndbcluster::rename_table(const char *from, const char *to)
|
|||
dict= ndb->getDictionary();
|
||||
if (!(orig_tab= dict->getTable(m_tabname)))
|
||||
ERR_RETURN(dict->getNdbError());
|
||||
|
||||
// Check if thread has stale local cache
|
||||
if (orig_tab->getObjectStatus() == NdbDictionary::Object::Invalid)
|
||||
{
|
||||
dict->removeCachedTable(m_tabname);
|
||||
if (!(orig_tab= dict->getTable(m_tabname)))
|
||||
ERR_RETURN(dict->getNdbError());
|
||||
}
|
||||
m_table= (void *)orig_tab;
|
||||
// Change current database to that of target table
|
||||
set_dbname(to);
|
||||
|
@ -4159,7 +4208,7 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg):
|
|||
m_active_trans(NULL),
|
||||
m_active_cursor(NULL),
|
||||
m_table(NULL),
|
||||
m_tableVersion(-1),
|
||||
m_table_version(-1),
|
||||
m_table_info(NULL),
|
||||
m_table_flags(HA_REC_NOT_IN_SEQ |
|
||||
HA_NULL_IN_KEY |
|
||||
|
@ -4409,7 +4458,6 @@ int ndbcluster_discover(THD* thd, const char *db, const char *name,
|
|||
DBUG_RETURN(1);
|
||||
ERR_RETURN(err);
|
||||
}
|
||||
|
||||
DBUG_PRINT("info", ("Found table %s", tab->getName()));
|
||||
|
||||
len= tab->getFrmLength();
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue