mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 01:04:19 +01:00
4f18083b08
The problem was that TRUNCATE TABLE didn't take a exclusive lock on a table if it resorted to truncating via delete of all rows in the table. Specifically for InnoDB tables, this could break proper isolation as InnoDB ends up aborting some granted locks when truncating a table. The solution is to take a exclusive metadata lock before TRUNCATE TABLE can proceed. This guarantees that no other transaction is using the table. Incompatible change: Truncate via delete no longer fails if sql_safe_updates is activated (this was a undocumented side effect). libmysqld/CMakeLists.txt: Add new files to the build list. libmysqld/Makefile.am: Add new files to the build list. mysql-test/extra/binlog_tests/binlog_truncate.test: Add test case for Bug#42643 mysql-test/include/mix1.inc: Update test case as TRUNCATE TABLE now grabs a exclusive lock. Ensure that TRUNCATE waits for granted locks on the table. mysql-test/suite/binlog/t/binlog_truncate_innodb.test: As with other data modifying statements, TRUNCATE is still not possible in a transaction with isolation level READ COMMITTED or READ UNCOMMITED. It would be possible to implement so, but it is not worth the effort. mysql-test/suite/binlog/t/binlog_truncate_myisam.test: Test under different binlog formats. mysql-test/suite/binlog/t/disabled.def: Re-enable test case. mysql-test/t/innodb_bug38231.test: Truncate no longer works with row-level locks. mysql-test/t/mdl_sync.test: Ensure that a acquired lock is not given up due to a conflict. mysql-test/t/partition_innodb_semi_consistent.test: End transaction as to release metadata locks. mysql-test/t/truncate.test: A metadata lock is now taken before the object is verified. sql/CMakeLists.txt: Add new files to the build list. sql/Makefile.am: Add new files to the build list. sql/datadict.cc: Introduce a new file specific for data dictionary operations. sql/datadict.h: Add header file. sql/sql_base.cc: Rename data dictionary function. sql/sql_bitmap.h: Include dependency. sql/sql_delete.cc: Move away from relying on mysql_delete() to delete all rows of a table. Thus, move any bits related to truncate to sql_truncate.cc sql/sql_delete.h: Remove parameter. sql/sql_parse.cc: Add protection against the global read lock -- a intention exclusive lock can be acquired in the truncate path. sql/sql_show.cc: Add sync point for testing scenarios where a pending flush is ignored. sql/sql_truncate.cc: Acquire a shared metadata lock before accessing table metadata. Upgrade the lock to a exclusive one if the table can be re-created. Rework binlog rules to better reflect the requirements. sql/sql_yacc.yy: Set appropriate lock types for table to be truncated. sql/table.h: Move to data dictionary header.
239 lines
8.3 KiB
Makefile
239 lines
8.3 KiB
Makefile
# Copyright (C) 2001-2006 MySQL AB
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Library General Public
|
|
# License as published by the Free Software Foundation; version 2
|
|
# of the License.
|
|
#
|
|
# This library 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
|
|
# Library General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Library General Public
|
|
# License along with this library; if not, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
# MA 02111-1307, USA
|
|
#
|
|
# This file is public domain and comes with NO WARRANTY of any kind
|
|
|
|
MYSQLDATAdir = $(localstatedir)
|
|
MYSQLSHAREdir = $(pkgdatadir)
|
|
MYSQLBASEdir= $(prefix)
|
|
MYSQLLIBdir= $(libdir)
|
|
pkgplugindir = $(pkglibdir)/plugin
|
|
|
|
EXTRA_DIST = libmysqld.def CMakeLists.txt
|
|
DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
|
|
-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
|
|
-DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
|
|
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
|
|
-DPLUGINDIR="\"$(pkgplugindir)\"" \
|
|
-DDISABLE_DTRACE \
|
|
@DEFS@
|
|
INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
-I$(top_builddir)/sql -I$(top_srcdir)/sql \
|
|
-I$(top_srcdir)/sql/examples \
|
|
-I$(top_srcdir)/regex \
|
|
$(openssl_includes) @ZLIB_INCLUDES@ \
|
|
@condition_dependent_plugin_includes@
|
|
|
|
noinst_LIBRARIES = libmysqld_int.a
|
|
pkglib_LIBRARIES = libmysqld.a
|
|
SUBDIRS = . examples
|
|
libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc
|
|
libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
|
|
my_time.c
|
|
|
|
noinst_HEADERS = embedded_priv.h emb_qcache.h
|
|
|
|
sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
|
|
ha_ndbcluster.cc ha_ndbcluster_cond.cc \
|
|
ha_ndbcluster_binlog.cc ha_partition.cc \
|
|
handler.cc sql_handler.cc \
|
|
hostname.cc init.cc password.c \
|
|
item.cc item_buff.cc item_cmpfunc.cc item_create.cc \
|
|
item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \
|
|
item_geofunc.cc item_subselect.cc item_row.cc\
|
|
item_xmlfunc.cc \
|
|
sha2.cc des_key_file.cc \
|
|
key.cc lock.cc log.cc sql_state.c \
|
|
log_event.cc rpl_record.cc rpl_utility.cc \
|
|
log_event_old.cc rpl_record_old.cc \
|
|
protocol.cc net_serv.cc opt_range.cc \
|
|
opt_sum.cc procedure.cc records.cc sql_acl.cc \
|
|
sql_load.cc discover.cc sql_locale.cc \
|
|
sql_profile.cc sql_truncate.cc datadict.cc \
|
|
sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \
|
|
sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \
|
|
sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc \
|
|
scheduler.cc sql_connect.cc sql_parse.cc \
|
|
sql_prepare.cc sql_derived.cc sql_rename.cc \
|
|
sql_select.cc sql_do.cc sql_show.cc set_var.cc sys_vars.cc \
|
|
sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \
|
|
sql_update.cc sql_yacc.cc table.cc thr_malloc.cc sql_time.cc \
|
|
unireg.cc uniques.cc sql_union.cc hash_filo.cc \
|
|
spatial.cc gstream.cc sql_help.cc tztime.cc sql_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 \
|
|
rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \
|
|
debug_sync.cc sql_tablespace.cc transaction.cc \
|
|
rpl_injector.cc my_user.c partition_info.cc \
|
|
sql_servers.cc event_parse_data.cc sql_signal.cc \
|
|
rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc
|
|
|
|
libmysqld_int_a_SOURCES= $(libmysqld_sources)
|
|
nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources)
|
|
libmysqld_a_SOURCES=
|
|
|
|
sqlstoragesources = $(EXTRA_libmysqld_a_SOURCES)
|
|
storagesources = @condition_dependent_plugin_modules@
|
|
storageobjects = @condition_dependent_plugin_objects@
|
|
storagesourceslinks = @condition_dependent_plugin_links@
|
|
|
|
# automake misses these
|
|
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)/mysys/libmysys.a \
|
|
$(top_builddir)/strings/libmystrings.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/vio/libvio.a \
|
|
@NDB_SCI_LIBS@ \
|
|
@mysql_plugin_libs@ \
|
|
$(yassl_inc_libs)
|
|
|
|
if HAVE_YASSL
|
|
yassl_inc_libs= $(top_builddir)/extra/yassl/src/.libs/libyassl.a \
|
|
$(top_builddir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a
|
|
endif
|
|
|
|
# Storage engine specific compilation options
|
|
ha_ndbcluster.o:ha_ndbcluster.cc
|
|
$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
|
|
|
|
ha_ndbcluster_cond.o:ha_ndbcluster_cond.cc
|
|
$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
|
|
|
|
ha_ndbcluster_binlog.o: ha_ndbcluster_binlog.cc
|
|
$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
|
|
|
|
# Until we can remove dependency on ha_ndbcluster.h
|
|
handler.o: handler.cc
|
|
$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
|
|
|
|
# We need rules to compile these as no good way
|
|
# found to append fileslists that collected by configure
|
|
# to the sources list
|
|
|
|
ha_federated.o:ha_federated.cc
|
|
$(CXXCOMPILE) $(LM_CFLAGS) -c $<
|
|
|
|
ha_heap.o:ha_heap.cc
|
|
$(CXXCOMPILE) $(LM_CFLAGS) -c $<
|
|
|
|
ha_innodb.o:ha_innodb.cc
|
|
$(CXXCOMPILE) $(LM_CFLAGS) -c $<
|
|
|
|
ha_myisam.o:ha_myisam.cc
|
|
$(CXXCOMPILE) $(LM_CFLAGS) -c $<
|
|
|
|
ha_myisammrg.o:ha_myisammrg.cc
|
|
$(CXXCOMPILE) $(LM_CFLAGS) -c $<
|
|
|
|
#
|
|
# To make it easy for the end user to use the embedded library we
|
|
# generate a total libmysqld.a from all library files,
|
|
|
|
# note - InnoDB libraries have circular dependencies, so in INC_LIB
|
|
# few libraries are present two times. Metrowerks linker doesn't like
|
|
# it at all. Traditional ar has no problems with it, but still there's no
|
|
# need to add the same file twice to the library, so 'sort -u' save us
|
|
# some time and spares unnecessary work.
|
|
|
|
libmysqld.a: libmysqld_int.a $(INC_LIB) $(libmysqld_a_DEPENDENCIES) $(storageobjects)
|
|
if DARWIN_MWCC
|
|
mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u` $(storageobjects)
|
|
else
|
|
-rm -f libmysqld.a
|
|
if test "$(host_os)" = "netware" ; \
|
|
then \
|
|
$(libmysqld_a_AR) libmysqld.a $(INC_LIB) libmysqld_int.a $(storageobjects); \
|
|
else \
|
|
current_dir=`pwd`; \
|
|
rm -rf tmp; mkdir tmp; \
|
|
(for arc in $(INC_LIB) ./libmysqld_int.a; do \
|
|
arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \
|
|
artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \
|
|
for F in `$(AR) t $$arc | grep -v SYMDEF`; do \
|
|
if test -e "$$arpath/$$F" ; then echo "$$arpath/$$F"; else \
|
|
mkdir $$artmp; cd $$artmp > /dev/null; \
|
|
$(AR) x ../../$$arc; \
|
|
cd $$current_dir > /dev/null; \
|
|
ls $$artmp/* | grep -v SYMDEF; \
|
|
continue 2; fi; done; \
|
|
done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \
|
|
$(AR) r libmysqld.a $(storageobjects); \
|
|
$(RANLIB) libmysqld.a ; \
|
|
rm -rf tmp; \
|
|
fi
|
|
endif
|
|
|
|
## XXX: any time the client interface changes, we'll need to bump
|
|
## the version info for libmysqld; however, it's possible for the
|
|
## libmysqld interface to change without affecting the standard
|
|
## libmysqlclient interface. Should we make a separate version
|
|
## string for the two?
|
|
#libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
|
|
#CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la
|
|
|
|
BUILT_SOURCES = link_sources
|
|
|
|
CLEANFILES = $(BUILT_SOURCES)
|
|
|
|
link_sources:
|
|
for f in $(sqlsources); do \
|
|
rm -f $$f; \
|
|
if test -e $(top_srcdir)/sql/$$f ; \
|
|
then \
|
|
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
|
|
else \
|
|
@LN_CP_F@ $(top_builddir)/sql/$$f $$f; \
|
|
fi ; \
|
|
done; \
|
|
for f in $(libmysqlsources); do \
|
|
rm -f $$f; \
|
|
if test -e $(top_srcdir)/libmysql/$$f ; \
|
|
then \
|
|
@LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \
|
|
else \
|
|
@LN_CP_F@ $(top_builddir)/libmysql/$$f $$f; \
|
|
fi ; \
|
|
done; \
|
|
if test -n "$(sqlstoragesources)" ; \
|
|
then \
|
|
for f in "$(sqlstoragesources)"; do \
|
|
rm -f "$$f"; \
|
|
@LN_CP_F@ `find $(srcdir)/../sql -name "$$f"` "$$f"; \
|
|
done; \
|
|
fi; \
|
|
if test -n "$(storagesources)" ; \
|
|
then \
|
|
rm -f $(storagesources); \
|
|
for f in $(storagesourceslinks); do \
|
|
@LN_CP_F@ $(top_srcdir)/$$f . ; \
|
|
done; \
|
|
fi; \
|
|
rm -f client_settings.h; \
|
|
@LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h \
|
|
client_settings.h; \
|
|
echo timestamp > link_sources
|
|
|
|
|
|
clean-local:
|
|
rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) | sed "s;\.lo;.c;g"`; \
|
|
rm -f client_settings.h
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|