database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge trift2.:/MySQL/M50/mysql-5.0

Browse Source 
into  trift2.:/MySQL/M51/mysql-5.1


libmysqld/Makefile.am:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
  Auto merged
client/Makefile.am:
  Merge does not fit - to be done manually.
This commit is contained in:
unknown
2007-05-02 14:08:43 +02:00
parent 55153730b2 589ae7b4e0
commit 67601f55cb
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmysqld/Makefile.am
View File

@ -190,11 +190,11 @@ link_sources:
for f in $(sqlsources); do \ for f in $(sqlsources); do \
rm -f $$f; \ rm -f $$f; \
if test -e $(top_srcdir)/sql/$$f ; \ if test -e $(top_srcdir)/sql/$$f ; \
then \ then \
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
else \ else \
@LN_CP_F@ $(top_builddir)/sql/$$f $$f; \ @LN_CP_F@ $(top_builddir)/sql/$$f $$f; \
fi ; \ fi ; \
done; \ done; \
for f in $(libmysqlsources); do \ for f in $(libmysqlsources); do \
rm -f $$f; \ rm -f $$f; \

6
netware/Makefile.am
View File

@ -98,20 +98,20 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def install_test_db.ncf \
# Build init_db.sql from the files that contain # Build init_db.sql from the files that contain
# the system tables for this version of MySQL plus any commands # the system tables for this version of MySQL plus any commands
init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \ init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \
$(top_srcdir)/scripts/mysql_system_tables_data.sql $(top_srcdir)/scripts/mysql_system_tables_data.sql
@echo "Building $@"; @echo "Building $@";
@echo "CREATE DATABASE mysql;" > $@; @echo "CREATE DATABASE mysql;" > $@;
@echo "CREATE DATABASE test;" >> $@; @echo "CREATE DATABASE test;" >> $@;
@echo "use mysql;" >> $@; @echo "use mysql;" >> $@;
@cat $(top_srcdir)/scripts/mysql_system_tables.sql \ @cat $(top_srcdir)/scripts/mysql_system_tables.sql \
$(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@; $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@;
# Build test_db.sql from init_db.sql plus # Build test_db.sql from init_db.sql plus
# some test data # some test data
test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql
@echo "Building $@"; @echo "Building $@";
@cat init_db.sql \ @cat init_db.sql \
$(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@; $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@;
endif endif

2
scripts/Makefile.am
View File

@ -113,7 +113,7 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT) $(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
$(top_builddir)/scripts/comp_sql$(EXEEXT) \ $(top_builddir)/scripts/comp_sql$(EXEEXT) \
mysql_fix_privilege_tables \ mysql_fix_privilege_tables \
$(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@