mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
a1bb24eb2b
From revision r5945 to r5994 r5950 - already applied and so skipped Detailed revision comments: r5945 | calvin | 2009-09-21 09:53:22 -0500 (Mon, 21 Sep 2009) | 4 lines branches/zip: fix a type in r5935 Should be innodb_open_files, spotted by Michael. r5951 | calvin | 2009-09-22 10:17:01 -0500 (Tue, 22 Sep 2009) | 4 lines branches/zip: adjust CMake file to work with old versions of MySQL Tested with MySQL 5.1.38 and 5.1.30. r5956 | calvin | 2009-09-22 18:30:10 -0500 (Tue, 22 Sep 2009) | 4 lines branches/zip: remove handler0vars.h from Makefile.am Left over from r5950. r5971 | marko | 2009-09-23 08:03:51 -0500 (Wed, 23 Sep 2009) | 2 lines branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup when the pwrite system call is not available. r5972 | marko | 2009-09-23 14:44:52 -0500 (Wed, 23 Sep 2009) | 5 lines branches/zip: fil_node_open_file(): In InnoDB Hot Backup, determine the page size of single-file tablespaces before computing the file node size. Otherwise, the space->size of compressed tablespaces would be computed with UNIV_PAGE_SIZE instead of key_block_size. This should fix Issue #313. r5973 | marko | 2009-09-23 14:53:21 -0500 (Wed, 23 Sep 2009) | 2 lines branches/zip: recv_add_to_hash_table(): Simplify obfuscated pointer arithmetics. r5978 | marko | 2009-09-24 02:47:56 -0500 (Thu, 24 Sep 2009) | 1 line branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined. r5979 | marko | 2009-09-24 05:16:10 -0500 (Thu, 24 Sep 2009) | 4 lines branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary. This preprocessor symbol has been recently introduced in MySQL 5.1. The InnoDB Plugin should remain source compatible with MySQL 5.1.24 and later. r5988 | calvin | 2009-09-25 14:14:43 -0500 (Fri, 25 Sep 2009) | 8 lines branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA 1453 (0x5AD) for InnoDB backend When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES occurs, yields for 100ms and retries the operation. Approved by: Heikki (on IM) r5992 | vasil | 2009-09-28 02:10:29 -0500 (Mon, 28 Sep 2009) | 4 lines branches/zip: Add ChangeLog entry for c5988. r5994 | marko | 2009-09-28 03:33:59 -0500 (Mon, 28 Sep 2009) | 17 lines branches/zip: Try to prevent the reuse of tablespace identifiers after InnoDB has crashed during table creation. Also, refuse to start if files with duplicate tablespace identifiers are encountered. fil_node_create(): Update fil_system->max_assigned_id. This should prevent the reuse of a space->id when InnoDB does a full crash recovery and invokes fil_load_single_table_tablespaces(). Normally, fil_system->max_assigned_id is initialized from SELECT MAX(ID) FROM SYS_TABLES. fil_open_single_table_tablespace(): Return FALSE when fil_space_create() fails. fil_load_single_table_tablespace(): Exit if fil_space_create() fails and innodb_force_recovery=0. rb://173 approved by Heikki Tuuri. This addresses Issue #335.
342 lines
8.4 KiB
Makefile
342 lines
8.4 KiB
Makefile
# Copyright (C) 2001, 2004, 2006 MySQL AB & Innobase Oy
|
|
#
|
|
# 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; version 2 of the License.
|
|
#
|
|
# 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
|
|
|
|
# Process this file with automake to create Makefile.in
|
|
|
|
MYSQLDATAdir= $(localstatedir)
|
|
MYSQLSHAREdir= $(pkgdatadir)
|
|
MYSQLBASEdir= $(prefix)
|
|
MYSQLLIBdir= $(pkglibdir)
|
|
pkgplugindir= $(pkglibdir)/plugin
|
|
INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include \
|
|
-I$(top_srcdir)/regex \
|
|
-I$(srcdir)/include \
|
|
-I$(top_srcdir)/sql \
|
|
-I$(srcdir) @ZLIB_INCLUDES@
|
|
|
|
DEFS= @DEFS@
|
|
|
|
|
|
noinst_HEADERS= \
|
|
handler/ha_innodb.h \
|
|
handler/i_s.h \
|
|
include/btr0btr.h \
|
|
include/btr0btr.ic \
|
|
include/btr0cur.h \
|
|
include/btr0cur.ic \
|
|
include/btr0pcur.h \
|
|
include/btr0pcur.ic \
|
|
include/btr0sea.h \
|
|
include/btr0sea.ic \
|
|
include/btr0types.h \
|
|
include/buf0buddy.h \
|
|
include/buf0buddy.ic \
|
|
include/buf0buf.h \
|
|
include/buf0buf.ic \
|
|
include/buf0flu.h \
|
|
include/buf0flu.ic \
|
|
include/buf0lru.h \
|
|
include/buf0lru.ic \
|
|
include/buf0rea.h \
|
|
include/buf0types.h \
|
|
include/data0data.h \
|
|
include/data0data.ic \
|
|
include/data0type.h \
|
|
include/data0type.ic \
|
|
include/data0types.h \
|
|
include/db0err.h \
|
|
include/dict0boot.h \
|
|
include/dict0boot.ic \
|
|
include/dict0crea.h \
|
|
include/dict0crea.ic \
|
|
include/dict0dict.h \
|
|
include/dict0dict.ic \
|
|
include/dict0load.h \
|
|
include/dict0load.ic \
|
|
include/dict0mem.h \
|
|
include/dict0mem.ic \
|
|
include/dict0types.h \
|
|
include/dyn0dyn.h \
|
|
include/dyn0dyn.ic \
|
|
include/eval0eval.h \
|
|
include/eval0eval.ic \
|
|
include/eval0proc.h \
|
|
include/eval0proc.ic \
|
|
include/fil0fil.h \
|
|
include/fsp0fsp.h \
|
|
include/fsp0fsp.ic \
|
|
include/fsp0types.h \
|
|
include/fut0fut.h \
|
|
include/fut0fut.ic \
|
|
include/fut0lst.h \
|
|
include/fut0lst.ic \
|
|
include/ha0ha.h \
|
|
include/ha0ha.ic \
|
|
include/ha0storage.h \
|
|
include/ha0storage.ic \
|
|
include/ha_prototypes.h \
|
|
include/handler0alter.h \
|
|
include/hash0hash.h \
|
|
include/hash0hash.ic \
|
|
include/ibuf0ibuf.h \
|
|
include/ibuf0ibuf.ic \
|
|
include/ibuf0types.h \
|
|
include/lock0iter.h \
|
|
include/lock0lock.h \
|
|
include/lock0lock.ic \
|
|
include/lock0priv.h \
|
|
include/lock0priv.ic \
|
|
include/lock0types.h \
|
|
include/log0log.h \
|
|
include/log0log.ic \
|
|
include/log0recv.h \
|
|
include/log0recv.ic \
|
|
include/mach0data.h \
|
|
include/mach0data.ic \
|
|
include/mem0dbg.h \
|
|
include/mem0dbg.ic \
|
|
include/mem0mem.h \
|
|
include/mem0mem.ic \
|
|
include/mem0pool.h \
|
|
include/mem0pool.ic \
|
|
include/mtr0log.h \
|
|
include/mtr0log.ic \
|
|
include/mtr0mtr.h \
|
|
include/mtr0mtr.ic \
|
|
include/mtr0types.h \
|
|
include/mysql_addons.h \
|
|
include/os0file.h \
|
|
include/os0proc.h \
|
|
include/os0proc.ic \
|
|
include/os0sync.h \
|
|
include/os0sync.ic \
|
|
include/os0thread.h \
|
|
include/os0thread.ic \
|
|
include/page0cur.h \
|
|
include/page0cur.ic \
|
|
include/page0page.h \
|
|
include/page0page.ic \
|
|
include/page0types.h \
|
|
include/page0zip.h \
|
|
include/page0zip.ic \
|
|
include/pars0grm.h \
|
|
include/pars0opt.h \
|
|
include/pars0opt.ic \
|
|
include/pars0pars.h \
|
|
include/pars0pars.ic \
|
|
include/pars0sym.h \
|
|
include/pars0sym.ic \
|
|
include/pars0types.h \
|
|
include/que0que.h \
|
|
include/que0que.ic \
|
|
include/que0types.h \
|
|
include/read0read.h \
|
|
include/read0read.ic \
|
|
include/read0types.h \
|
|
include/rem0cmp.h \
|
|
include/rem0cmp.ic \
|
|
include/rem0rec.h \
|
|
include/rem0rec.ic \
|
|
include/rem0types.h \
|
|
include/row0ext.h \
|
|
include/row0ext.ic \
|
|
include/row0ins.h \
|
|
include/row0ins.ic \
|
|
include/row0merge.h \
|
|
include/row0mysql.h \
|
|
include/row0mysql.ic \
|
|
include/row0purge.h \
|
|
include/row0purge.ic \
|
|
include/row0row.h \
|
|
include/row0row.ic \
|
|
include/row0sel.h \
|
|
include/row0sel.ic \
|
|
include/row0types.h \
|
|
include/row0uins.h \
|
|
include/row0uins.ic \
|
|
include/row0umod.h \
|
|
include/row0umod.ic \
|
|
include/row0undo.h \
|
|
include/row0undo.ic \
|
|
include/row0upd.h \
|
|
include/row0upd.ic \
|
|
include/row0vers.h \
|
|
include/row0vers.ic \
|
|
include/srv0que.h \
|
|
include/srv0srv.h \
|
|
include/srv0srv.ic \
|
|
include/srv0start.h \
|
|
include/sync0arr.h \
|
|
include/sync0arr.ic \
|
|
include/sync0rw.h \
|
|
include/sync0rw.ic \
|
|
include/sync0sync.h \
|
|
include/sync0sync.ic \
|
|
include/sync0types.h \
|
|
include/thr0loc.h \
|
|
include/thr0loc.ic \
|
|
include/trx0i_s.h \
|
|
include/trx0purge.h \
|
|
include/trx0purge.ic \
|
|
include/trx0rec.h \
|
|
include/trx0rec.ic \
|
|
include/trx0roll.h \
|
|
include/trx0roll.ic \
|
|
include/trx0rseg.h \
|
|
include/trx0rseg.ic \
|
|
include/trx0sys.h \
|
|
include/trx0sys.ic \
|
|
include/trx0trx.h \
|
|
include/trx0trx.ic \
|
|
include/trx0types.h \
|
|
include/trx0undo.h \
|
|
include/trx0undo.ic \
|
|
include/trx0xa.h \
|
|
include/univ.i \
|
|
include/usr0sess.h \
|
|
include/usr0sess.ic \
|
|
include/usr0types.h \
|
|
include/ut0auxconf.h \
|
|
include/ut0byte.h \
|
|
include/ut0byte.ic \
|
|
include/ut0dbg.h \
|
|
include/ut0list.h \
|
|
include/ut0list.ic \
|
|
include/ut0lst.h \
|
|
include/ut0mem.h \
|
|
include/ut0mem.ic \
|
|
include/ut0rnd.h \
|
|
include/ut0rnd.ic \
|
|
include/ut0sort.h \
|
|
include/ut0ut.h \
|
|
include/ut0ut.ic \
|
|
include/ut0vec.h \
|
|
include/ut0vec.ic \
|
|
include/ut0wqueue.h \
|
|
mem/mem0dbg.c
|
|
|
|
EXTRA_LIBRARIES= libinnobase.a
|
|
noinst_LIBRARIES= @plugin_innodb_plugin_static_target@
|
|
libinnobase_a_SOURCES= \
|
|
btr/btr0btr.c \
|
|
btr/btr0cur.c \
|
|
btr/btr0pcur.c \
|
|
btr/btr0sea.c \
|
|
buf/buf0buddy.c \
|
|
buf/buf0buf.c \
|
|
buf/buf0flu.c \
|
|
buf/buf0lru.c \
|
|
buf/buf0rea.c \
|
|
data/data0data.c \
|
|
data/data0type.c \
|
|
dict/dict0boot.c \
|
|
dict/dict0crea.c \
|
|
dict/dict0dict.c \
|
|
dict/dict0load.c \
|
|
dict/dict0mem.c \
|
|
dyn/dyn0dyn.c \
|
|
eval/eval0eval.c \
|
|
eval/eval0proc.c \
|
|
fil/fil0fil.c \
|
|
fsp/fsp0fsp.c \
|
|
fut/fut0fut.c \
|
|
fut/fut0lst.c \
|
|
ha/ha0ha.c \
|
|
ha/ha0storage.c \
|
|
ha/hash0hash.c \
|
|
handler/ha_innodb.cc \
|
|
handler/handler0alter.cc \
|
|
handler/i_s.cc \
|
|
handler/mysql_addons.cc \
|
|
ibuf/ibuf0ibuf.c \
|
|
lock/lock0iter.c \
|
|
lock/lock0lock.c \
|
|
log/log0log.c \
|
|
log/log0recv.c \
|
|
mach/mach0data.c \
|
|
mem/mem0mem.c \
|
|
mem/mem0pool.c \
|
|
mtr/mtr0log.c \
|
|
mtr/mtr0mtr.c \
|
|
os/os0file.c \
|
|
os/os0proc.c \
|
|
os/os0sync.c \
|
|
os/os0thread.c \
|
|
page/page0cur.c \
|
|
page/page0page.c \
|
|
page/page0zip.c \
|
|
pars/lexyy.c \
|
|
pars/pars0grm.c \
|
|
pars/pars0opt.c \
|
|
pars/pars0pars.c \
|
|
pars/pars0sym.c \
|
|
que/que0que.c \
|
|
read/read0read.c \
|
|
rem/rem0cmp.c \
|
|
rem/rem0rec.c \
|
|
row/row0ext.c \
|
|
row/row0ins.c \
|
|
row/row0merge.c \
|
|
row/row0mysql.c \
|
|
row/row0purge.c \
|
|
row/row0row.c \
|
|
row/row0sel.c \
|
|
row/row0uins.c \
|
|
row/row0umod.c \
|
|
row/row0undo.c \
|
|
row/row0upd.c \
|
|
row/row0vers.c \
|
|
srv/srv0que.c \
|
|
srv/srv0srv.c \
|
|
srv/srv0start.c \
|
|
sync/sync0arr.c \
|
|
sync/sync0rw.c \
|
|
sync/sync0sync.c \
|
|
thr/thr0loc.c \
|
|
trx/trx0i_s.c \
|
|
trx/trx0purge.c \
|
|
trx/trx0rec.c \
|
|
trx/trx0roll.c \
|
|
trx/trx0rseg.c \
|
|
trx/trx0sys.c \
|
|
trx/trx0trx.c \
|
|
trx/trx0undo.c \
|
|
usr/usr0sess.c \
|
|
ut/ut0byte.c \
|
|
ut/ut0dbg.c \
|
|
ut/ut0list.c \
|
|
ut/ut0mem.c \
|
|
ut/ut0rnd.c \
|
|
ut/ut0ut.c \
|
|
ut/ut0vec.c \
|
|
ut/ut0wqueue.c
|
|
|
|
libinnobase_a_CXXFLAGS= $(AM_CFLAGS)
|
|
libinnobase_a_CFLAGS= $(AM_CFLAGS)
|
|
|
|
EXTRA_LTLIBRARIES= ha_innodb_plugin.la
|
|
pkgplugin_LTLIBRARIES= @plugin_innodb_plugin_shared_target@
|
|
|
|
ha_innodb_plugin_la_LDFLAGS= -module -rpath $(pkgplugindir)
|
|
ha_innodb_plugin_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
|
|
ha_innodb_plugin_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
|
|
ha_innodb_plugin_la_SOURCES= $(libinnobase_a_SOURCES)
|
|
|
|
EXTRA_DIST= CMakeLists.txt plug.in \
|
|
pars/make_bison.sh pars/make_flex.sh \
|
|
pars/pars0grm.y pars/pars0lex.l
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|