2006-12-31 01:32:21 +01:00
|
|
|
# Copyright (C) 2001, 2004, 2006 MySQL AB & Innobase Oy
|
2001-02-17 13:19:19 +01:00
|
|
|
#
|
|
|
|
|
# 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
|
2006-12-23 20:20:40 +01:00
|
|
|
# the Free Software Foundation; version 2 of the License.
|
2001-02-17 13:19:19 +01:00
|
|
|
#
|
|
|
|
|
# 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
|
|
|
|
|
|
2006-08-23 22:59:16 +02:00
|
|
|
MYSQLDATAdir = $(localstatedir)
|
|
|
|
|
MYSQLSHAREdir = $(pkgdatadir)
|
|
|
|
|
MYSQLBASEdir= $(prefix)
|
|
|
|
|
MYSQLLIBdir= $(pkglibdir)
|
|
|
|
|
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
|
|
|
|
|
-I$(top_srcdir)/regex \
|
|
|
|
|
-I$(top_srcdir)/storage/innobase/include \
|
|
|
|
|
-I$(top_srcdir)/sql \
|
|
|
|
|
-I$(srcdir)
|
|
|
|
|
|
2001-02-17 13:19:19 +01:00
|
|
|
AUTOMAKE_OPTIONS = foreign
|
|
|
|
|
TAR = gtar
|
|
|
|
|
|
2006-08-23 22:59:16 +02:00
|
|
|
noinst_HEADERS =
|
2001-03-06 03:08:24 +01:00
|
|
|
|
2004-03-11 11:55:28 +01:00
|
|
|
SUBDIRS = os ut btr buf data dict dyn eval fil fsp fut \
|
2005-12-13 14:49:24 +01:00
|
|
|
ha ibuf lock log mach mem mtr page \
|
2006-09-07 17:23:58 +02:00
|
|
|
handler \
|
2001-03-06 00:33:13 +01:00
|
|
|
pars que read rem row srv sync thr trx usr
|
2001-02-17 13:19:19 +01:00
|
|
|
|
2005-12-16 12:45:43 +01:00
|
|
|
EXTRA_DIST = 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/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/fut0fut.h include/fut0fut.ic include/fut0lst.h include/fut0lst.ic \
|
|
|
|
|
include/ha0ha.h include/ha0ha.ic include/hash0hash.h include/hash0hash.ic \
|
|
|
|
|
include/ibuf0ibuf.h include/ibuf0ibuf.ic include/ibuf0types.h \
|
|
|
|
|
include/lock0lock.h include/lock0lock.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/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/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/row0ins.h include/row0ins.ic 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/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/ut0byte.h include/ut0byte.ic include/ut0dbg.h include/ut0lst.h \
|
|
|
|
|
include/ut0mem.h include/ut0mem.ic include/ut0rnd.h include/ut0rnd.ic \
|
2006-09-07 17:23:58 +02:00
|
|
|
handler/ha_innodb.h \
|
Applied innodb-5.1-ss594 snapshot.
Fixed BUG#19542 "InnoDB doesn't increase the Handler_read_prev couter".
Fixed BUG#19609 "Case sensitivity of innodb_data_file_path gives stupid error".
Fixed BUG#19727 "InnoDB crashed server and crashed tables are ot recoverable".
Also:
* Remove remnants of the obsolete concept of memoryfixing tables and indexes.
* Remove unused dict_table_LRU_trim().
* Remove unused 'trx' parameter from dict_table_get_on_id_low(),
dict_table_get(), dict_table_get_and_increment_handle_count().
* Add a normal linked list implementation.
* Add a work queue implementation.
* Add 'level' parameter to mutex_create() and rw_lock_create().
Remove mutex_set_level() and rw_lock_set_level().
* Rename SYNC_LEVEL_NONE to SYNC_LEVEL_VARYING.
* Add support for bound ids in InnoDB's parser.
* Define UNIV_BTR_DEBUG for enabling consistency checks of
FIL_PAGE_NEXT and FIL_PAGE_PREV when accessing sibling
pages of B-tree indexes.
btr_validate_level(): Check the validity of the doubly linked
list formed by FIL_PAGE_NEXT and FIL_PAGE_PREV.
* Adapt InnoDB to the new tablename to filename encoding in MySQL 5.1.
ut_print_name(), ut_print_name1(): Add parameter 'table_id' for
distinguishing names of tables from other identifiers.
New: innobase_convert_from_table_id(), innobase_convert_from_id(),
innobase_convert_from_filename(), innobase_get_charset.
dict_accept(), dict_scan_id(), dict_scan_col(), dict_scan_table_name(),
dict_skip_word(), dict_create_foreign_constraints_low(): Add
parameter 'cs' so that isspace() can be replaced with my_isspace(),
whose operation depends on the connection character set.
dict_scan_id(): Convert identifier to UTF-8.
dict_str_starts_with_keyword(): New extern function, to replace
dict_accept() in row_search_for_mysql().
mysql_get_identifier_quote_char(): Replaced with innobase_print_identifier().
ha_innobase::create(): Remove the thd->convert_strin() call. Pass the
statement to InnoDB in the connection character set and let InnoDB
convert the identifier to UTF-8.
* Add max_row_size to dict_table_t.
* btr0cur.c
btr_copy_externally_stored_field(): Only set the 'offset' variable
when needed.
* buf0buf.c
buf_page_io_complete(): Write to the error log if the page number or
the space id o the disk do not match those in memory. Also write to
the error log if a page was read from the doublewrite buffer. The
doublewrite buffer should be only read by the lower-level function
fil_io() at database startup.
* dict0dict.c
dict_scan_table_name(): Remove fallback to differently encoded name
when the table is not found. The encoding is handled at a higher level.
* ha_innodb.cc
Increment statistic counter in ha_innobase::index_prev() (bug 19542).
Add innobase_convert_string wrapper function and a new file
ha_prototypes.h.
innobase_print_identifier(): Remove TODO comment before calling
get_quote_char_for_identifier(). That function apparently assumes
the identifier to be encoded in UTF-8.
* ibuf0ibuf.c|h
ibuf_count_get(), ibuf_counts[], ibuf_count_inited(): Define these
only #ifdef UNIV_IBUF_DEBUG. Previously, when compiled without
UNIV_IBUF_DEBUG, invoking ibuf_count_get() would crash InnoDB.
The function is only being called #ifdef UNIV_IBUF_DEBUG.
* innodb.result
Adjust the results for changes in the foreign key error messages.
* mem0mem.c|h
New: mem_heap_dup(), mem_heap_printf(), mem_heap_cat().
* os0file.c
Check the page trailers also after writing to disk. This improves
chances of diagnosing bug 18886.
os_file_check_page_trailers(): New function for checking that the
two copies of the LSN stamped on the page match.
os_aio_simulated_handle(): Call os_file_check_page_trailers()
before and after os_file_write().
* row0mysql.c
Move trx_commit_for_mysql(trx) calls before calls to
row_mysql_unlock_data_dictionary(trx) (bug 19727).
* row0sel.c
row_fetch_print(): Handle SQL NULL values without crashing.
row_sel_store_mysql_rec(): Remove useless call to rec_get_nth_field
when handling an externally stored column.
Fetch externally stored fields when using InnoDB's internal SQL
parser.
Optimize BLOB selects by using prebuilt->blob_heap directly instead
of first reading BLOB data to a temporary heap and then copying it
to prebuilt->blob_heap.
* srv0srv.c
srv_master_thread(): Remove unreachable code.
* srv0start.c
srv_parse_data_file_paths_and_sizes(): Accept lower-case 'm' and
'g' as abbreviations of megabyte and gigabyte (bug 19609).
srv_parse_megabytes(): New fuction.
* ut0dbg.c|h
Implement InnoDB assertions (ut_a and ut_error) with abort() when
the code is compiled with GCC 3 or later on other platforms than
Windows or Netware. Also disable the variable ut_dbg_stop_threads
and the function ut_dbg_stop_thread() i this case, unless
UNIV_SYC_DEBUG is defined. This should allow the compiler to
generate more compact code for assertions.
* ut0list.c|h
Add ib_list_create_heap().
mysql-test/r/innodb.result:
Applied innodb-5.1-ss594 snapshot.
mysql-test/t/innodb.test:
Copy the comment from the beginning of the file
to the end because MySQL developers continue
adding test cases to this file.
sql/ha_innodb.cc:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/CMakeLists.txt:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/Makefile.am:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/btr/btr0btr.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/btr/btr0cur.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/btr/btr0pcur.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/btr/btr0sea.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/buf/buf0buf.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/buf/buf0flu.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/data/data0type.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/dict/dict0crea.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/dict/dict0dict.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/dict/dict0load.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/dict/dict0mem.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/fil/fil0fil.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/ha/hash0hash.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/ibuf/ibuf0ibuf.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/data0type.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/dict0dict.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/dict0dict.ic:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/dict0mem.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/fil0fil.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/fsp0fsp.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/ibuf0ibuf.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/mem0mem.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/pars0pars.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/pars0sym.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/pars0types.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/rem0rec.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/row0purge.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/row0undo.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/srv0srv.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/sync0rw.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/sync0sync.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/univ.i:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/ut0dbg.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/ut0ut.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/lock/lock0lock.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/log/log0log.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/log/log0recv.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/mem/mem0dbg.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/mem/mem0mem.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/mem/mem0pool.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/os/os0file.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/os/os0thread.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/pars/lexyy.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/pars/pars0lex.l:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/pars/pars0pars.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/pars/pars0sym.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/row/row0ins.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/row/row0mysql.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/row/row0purge.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/row/row0row.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/row/row0sel.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/row/row0upd.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/srv/srv0srv.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/srv/srv0start.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/sync/sync0arr.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/sync/sync0rw.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/sync/sync0sync.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/thr/thr0loc.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/trx/trx0purge.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/trx/trx0rec.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/trx/trx0roll.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/trx/trx0rseg.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/trx/trx0sys.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/trx/trx0trx.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/ut/Makefile.am:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/ut/ut0dbg.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/ut/ut0ut.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/ha_prototypes.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/ut0list.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/ut0list.ic:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/include/ut0wqueue.h:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/ut/ut0list.c:
Applied innodb-5.1-ss594 snapshot.
storage/innobase/ut/ut0wqueue.c:
Applied innodb-5.1-ss594 snapshot.
2006-06-01 08:34:04 +02:00
|
|
|
include/ut0sort.h include/ut0ut.h include/ut0ut.ic include/ut0vec.h include/ut0vec.ic include/ha_prototypes.h \
|
2006-06-15 03:43:19 +02:00
|
|
|
include/ut0list.h include/ut0list.ic \
|
|
|
|
|
include/ut0wqueue.h \
|
2007-03-29 06:46:28 +02:00
|
|
|
pars/make_bison.sh pars/make_flex.sh \
|
2007-03-30 06:57:58 +02:00
|
|
|
pars/pars0grm.y pars/pars0lex.l \
|
2006-09-19 04:31:08 +02:00
|
|
|
CMakeLists.txt plug.in
|
2005-12-16 12:45:43 +01:00
|
|
|
|
2006-04-13 22:49:29 +02:00
|
|
|
noinst_LIBRARIES = libinnobase.a
|
|
|
|
|
libinnobase_a_LIBADD = usr/libusr.a srv/libsrv.a dict/libdict.a \
|
|
|
|
|
que/libque.a srv/libsrv.a ibuf/libibuf.a \
|
|
|
|
|
row/librow.a pars/libpars.a btr/libbtr.a \
|
|
|
|
|
trx/libtrx.a read/libread.a usr/libusr.a \
|
|
|
|
|
buf/libbuf.a ibuf/libibuf.a eval/libeval.a \
|
|
|
|
|
log/liblog.a fsp/libfsp.a fut/libfut.a \
|
|
|
|
|
fil/libfil.a lock/liblock.a mtr/libmtr.a \
|
|
|
|
|
page/libpage.a rem/librem.a thr/libthr.a \
|
|
|
|
|
sync/libsync.a data/libdata.a mach/libmach.a \
|
|
|
|
|
ha/libha.a dyn/libdyn.a mem/libmem.a \
|
2006-09-07 17:23:58 +02:00
|
|
|
handler/libhandler.a \
|
2006-04-13 22:49:29 +02:00
|
|
|
ut/libut.a os/libos.a ut/libut.a
|
|
|
|
|
libinnobase_a_SOURCES =
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
libinnobase.a: $(libinnobase_a_LIBADD)
|
|
|
|
|
-rm -f $@
|
|
|
|
|
if test "$(host_os)" = "netware" ; \
|
|
|
|
|
then \
|
2006-04-29 18:33:34 +02:00
|
|
|
$(libinnobase_a_AR) $@ $(libinnobase_a_LIBADD) ; \
|
2006-04-13 22:49:29 +02:00
|
|
|
else \
|
2006-04-29 18:33:34 +02:00
|
|
|
for arc in $(libinnobase_a_LIBADD); do \
|
|
|
|
|
arpath=`echo $$arc|sed 's|[^/]*$$||'`; \
|
|
|
|
|
$(AR) t $$arc|sed "s|^|$$arpath|"; \
|
|
|
|
|
done | sort -u | xargs $(AR) cq $@ ; \
|
2006-04-13 22:49:29 +02:00
|
|
|
$(RANLIB) $@ ; \
|
|
|
|
|
fi
|
|
|
|
|
|
2001-02-21 13:16:00 +01:00
|
|
|
# Don't update the files from bitkeeper
|
|
|
|
|
%::SCCS/s.%
|