mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
bbab9ec678
Noteworthy: - New HANDLER code - New multi-update-grant-check code - Table lock code in ha_innodb.cc was not applied BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e: Auto merged Build-tools/mysql-copyright-2: Auto merged acinclude.m4: Auto merged client/mysqladmin.c: Auto merged client/mysqldump.c: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/myisam.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/buf/buf0buf.c: Auto merged ltmain.sh: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/row/row0row.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/ut/ut0dbg.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_close.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_locking.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/r/delete.result: Auto merged mysql-test/r/func_if.result: Auto merged Build-tools/mysql-copyright: Merge with 4.0 (too most of the code from 4.0) Makefile.am: merge client/mysql.cc: Used 4.1 code configure.in: merge innobase/os/os0file.c: merge innobase/row/row0mysql.c: merge mysql-test/r/ctype_latin1_de.result: merge mysql-test/r/flush_table.result: merge mysql-test/r/func_str.result: merge mysql-test/r/handler.result: merge mysql-test/r/multi_update.result: merge mysql-test/r/type_timestamp.result: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/r/update.result: merge mysql-test/t/delete.test: merge mysql-test/t/flush_table.test: merge mysql-test/t/func_str.test: merge mysql-test/t/handler.test: merge mysql-test/t/multi_update.test: merge mysql-test/t/type_timestamp.test: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/t/update.test: merge mysys/errors.c: merge mysys/my_fstream.c: merge mysys/my_pread.c: merge mysys/my_write.c: merge mysys/mysys_priv.h: merge scripts/mysqlhotcopy.sh: merge sql/field.cc: Keep code from 4.1 sql/field.h: Keep code from 4.1 sql/ha_innodb.cc: Don't merge lock code from 4.0; Heikki will look at this sql/ha_myisam.cc: merge sql/handler.cc: merge sql/item_cmpfunc.cc: merge sql/item_cmpfunc.h: merge sql/item_strfunc.cc: merge sql/mysql_priv.h: merge sql/mysqld.cc: merge sql/protocol.cc: merge sql/records.cc: merge sql/repl_failsafe.cc: merge mysql-test/r/lock_multi.result: merge mysql-test/t/ctype_latin1_de.test: merge mysql-test/t/func_if.test: merge mysql-test/t/lock_multi.test: merge sql/repl_failsafe.h: merge Remove unnessessary header protection sql/slave.h: merge sql/sql_acl.cc: merge sql/sql_base.cc: merge sql/sql_cache.cc: auto merge sql/sql_class.cc: merge sql/sql_class.h: merge sql/sql_delete.cc: merge sql/sql_handler.cc: Get new HANDLER code into 4.1 sql/sql_parse.cc: Keep old file sql/sql_repl.cc: merge sql/sql_repl.h: merge sql/sql_show.cc: merge sql/sql_table.cc: merge sql/sql_union.cc: Applied the examine_rows bug fix from 4.0 by hand sql/sql_update.cc: New multi-update-grant-check code from 4.0 sql/sql_yacc.yy: New multi-update-grant-check code from 4.0 sql/stacktrace.c: merge sql/table.h: merge
104 lines
3.4 KiB
Makefile
104 lines
3.4 KiB
Makefile
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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
|
|
|
|
# Process this file with automake to create Makefile.in
|
|
|
|
AUTOMAKE_OPTIONS = foreign
|
|
|
|
# These are built from source in the Docs directory
|
|
EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
|
|
SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
|
|
@readline_topdir@ sql-common \
|
|
@thread_dirs@ pstack @sql_client_dirs@ \
|
|
@sql_server_dirs@ scripts man tests \
|
|
netware @libmysqld_dirs@ \
|
|
@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
|
|
|
|
DIST_SUBDIRS = . include @docs_dirs@ zlib \
|
|
@readline_topdir@ sql-common \
|
|
@thread_dirs@ pstack @sql_client_dirs@ \
|
|
@sql_server_dirs@ scripts @man_dirs@ tests SSL\
|
|
BUILD netware os2 @libmysqld_dirs@ \
|
|
@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
|
|
|
|
# Relink after clean
|
|
linked_sources = linked_client_sources linked_server_sources \
|
|
linked_libmysql_sources linked_libmysql_r_sources \
|
|
linked_libmysqld_sources linked_libmysqldex_sources \
|
|
linked_include_sources @linked_netware_sources@
|
|
|
|
CLEANFILES = $(linked_sources)
|
|
|
|
# This is just so that the linking is done early.
|
|
all-local: $(linked_sources)
|
|
|
|
linked_include_sources:
|
|
cd include; $(MAKE) link_sources
|
|
echo timestamp > linked_include_sources
|
|
|
|
linked_client_sources: @linked_client_targets@
|
|
cd client; $(MAKE) link_sources
|
|
echo timestamp > linked_client_sources
|
|
|
|
linked_libmysql_sources:
|
|
cd libmysql; $(MAKE) link_sources
|
|
echo timestamp > linked_libmysql_sources
|
|
|
|
linked_libmysql_r_sources: linked_libmysql_sources
|
|
cd libmysql_r; $(MAKE) link_sources
|
|
echo timestamp > linked_libmysql_r_sources
|
|
|
|
linked_libmysqld_sources:
|
|
cd libmysqld; $(MAKE) link_sources
|
|
echo timestamp > linked_libmysqld_sources
|
|
|
|
linked_libmysqldex_sources:
|
|
cd libmysqld/examples; $(MAKE) link_sources
|
|
echo timestamp > linked_libmysqldex_sources
|
|
|
|
linked_netware_sources:
|
|
cd @netware_dir@; $(MAKE) link_sources
|
|
echo timestamp > linked_netware_sources
|
|
|
|
#avoid recursive make calls in sql directory
|
|
linked_server_sources:
|
|
cd sql; rm -f mini_client_errors.c;\
|
|
@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c;\
|
|
rm -f pack.c;@LN_CP_F@ ../sql-common/pack.c pack.c;\
|
|
rm -f client.c;@LN_CP_F@ ../sql-common/client.c client.c;\
|
|
rm -f my_time.c;@LN_CP_F@ ../sql-common/my_time.c my_time.c
|
|
echo timestamp > linked_server_sources
|
|
|
|
# Create permission databases
|
|
init-db: all
|
|
$(top_builddir)/scripts/mysql_install_db
|
|
|
|
bin-dist: all
|
|
$(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@
|
|
|
|
# Remove BK's "SCCS" subdirectories from source distribution
|
|
dist-hook:
|
|
rm -rf `find $(distdir) -type d -name SCCS`
|
|
|
|
tags:
|
|
support-files/build-tags
|
|
.PHONY: init-db bin-dist
|
|
|
|
# Test installation
|
|
|
|
test:
|
|
cd mysql-test ; ./mysql-test-run
|
|
|