Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-11-22 11:48:06+02:00, gkodinov@stripped +1 -0
Merge bk-internal:/home/bk/mysql-5.1
into macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.1
MERGE: 1.2273.57.9
sql/Makefile.am@stripped, 2006-11-22 11:47:57+02:00, gkodinov@stripped +0 -4
manual merge
MERGE: 1.155.1.10
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: gkodinov
# Host: macbook.gmz
# Root: /Users/kgeorge/mysql/work/mysql-5.1/RESYNC
--- 1.156/sql/Makefile.am 2006-09-18 17:00:06 +03:00
+++ 1.157/sql/Makefile.am 2006-11-22 11:47:57 +02:00
@@ -30,13 +30,13 @@ libexec_PROGRAMS = mysqld
noinst_PROGRAMS = gen_lex_hash
bin_PROGRAMS = mysql_tzinfo_to_sql
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
-ldadd_objects = $(top_builddir)/vio/libvio.a \
+SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/regex/libregex.a \
$(top_builddir)/strings/libmystrings.a
-LDADD = $(ldadd_objects) @ZLIB_LIBS@
-mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(ldadd_objects)
+mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS)
+LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
@pstack_libs@ \
@mysql_plugin_libs@ \
@@ -53,8 +53,8 @@ noinst_HEADERS = item.h item_func.h item
ha_partition.h \
ha_ndbcluster.h ha_ndbcluster_binlog.h \
ha_ndbcluster_tables.h \
- opt_range.h protocol.h rpl_tblmap.h \
- log.h sql_show.h rpl_rli.h \
+ opt_range.h protocol.h rpl_tblmap.h rpl_utility.h \
+ log.h sql_show.h rpl_rli.h rpl_mi.h \
sql_select.h structs.h table.h sql_udf.h hash_filo.h \
lex.h lex_symbol.h sql_acl.h sql_crypt.h \
log_event.h sql_repl.h slave.h rpl_filter.h \
@@ -94,7 +94,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.
sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
slave.cc sql_repl.cc rpl_filter.cc rpl_tblmap.cc \
- rpl_injector.cc \
+ rpl_utility.cc rpl_injector.cc rpl_rli.cc rpl_mi.cc \
sql_union.cc sql_derived.cc \
client.c sql_client.cc mini_client_errors.c pack.c\
stacktrace.c repl_failsafe.h repl_failsafe.cc \
@@ -121,9 +121,11 @@ DEFS = -DMYSQL_SERVER \
-DLIBDIR="\"$(MYSQLLIBdir)\"" \
@DEFS@
-BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h
-EXTRA_DIST = udf_example.c $(BUILT_SOURCES) \
- nt_servc.cc nt_servc.h message.mc CMakeLists.txt
+BUILT_DIST_SRC = sql_yacc.cc sql_yacc.h
+BUILT_SOURCES = $(BUILT_DIST_SRC) lex_hash.h
+EXTRA_DIST = udf_example.c udf_example.def $(BUILT_DIST_SRC) \
+ nt_servc.cc nt_servc.h message.mc CMakeLists.txt \
+ udf_example.c udf_example.def
CLEANFILES = lex_hash.h sql_yacc.cc sql_yacc.h sql_yacc.output
AM_YFLAGS = -d --debug --verbose
@@ -150,13 +152,19 @@ mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to
# things like different grammars for different pars of MySQL can
# happen if you are unlucky.
sql_yacc.cc: sql_yacc.yy
+
sql_yacc.h: sql_yacc.yy
sql_yacc.o: sql_yacc.cc sql_yacc.h $(HEADERS)
+ @SED@ -e 's/__attribute__ ((__unused__))//' sql_yacc.cc > sql_yacc.cc-new
+ @MV@ sql_yacc.cc-new sql_yacc.cc
@echo "Note: The following compile may take a long time."
@echo "If it fails, re-run configure with --with-low-memory"
$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+# FIXME seems like now "lex_hash.h" differs depending on configure
+# flags, so can't pregenerate and include in source TAR. Revert to
+# dist pregenerated if this changes, so the file doesn't differ.
lex_hash.h: gen_lex_hash$(EXEEXT)
./gen_lex_hash$(EXEEXT) > $@
| Thread |
|---|
| • bk commit into 5.1 tree (gkodinov:1.2371) | kgeorge | 22 Nov |
