bzr push into mysql-5.1 branch (joerg.bruehe:3759 to 3760)

[Joerg Bruehe]

 3760 Joerg Bruehe	2012-06-22
      Solve a linkage problem with "libmysqld" on several Solaris platforms:
      a multiple definition of 'THD::clear_error()' in (at least)
      libmysqld.a(lib_sql.o) and libmysqld.a(libfederated_a-ha_federated.o).
      
      Patch provided by Ramil Kalimullin.

    modified:
      libmysqld/Makefile.am
 3759 Joerg Bruehe	2012-06-21
      Fixing wrong comment syntax (discovered by Kent)

    modified:
      sql/rpl_utility.h
=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am	2011-06-30 15:37:13 +0000
+++ b/libmysqld/Makefile.am	2012-06-22 09:48:50 +0000
@@ -109,36 +109,36 @@ endif
 
 # Storage engine specific compilation options
 ha_ndbcluster.o:ha_ndbcluster.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) $(DEFS) -c $<
 
 ha_ndbcluster_cond.o:ha_ndbcluster_cond.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) $(DEFS) -c $<
 
 ha_ndbcluster_binlog.o: ha_ndbcluster_binlog.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) $(DEFS) -c $<
 
 # Until we can remove dependency on ha_ndbcluster.h
 handler.o:	handler.cc
-		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) $(DEFS) -c $<
 
 # We need rules to compile these as no good way
 # found to append fileslists that collected by configure
 # to the sources list
 
 ha_federated.o:ha_federated.cc
-		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) $(LM_CFLAGS) $(DEFS) -c $<
 
 ha_heap.o:ha_heap.cc
-		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) $(LM_CFLAGS) $(DEFS) -c $<
 
 ha_innodb.o:ha_innodb.cc
-		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) $(LM_CFLAGS) $(DEFS) -c $<
 
 ha_myisam.o:ha_myisam.cc
-		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) $(LM_CFLAGS) $(DEFS) -c $<
 
 ha_myisammrg.o:ha_myisammrg.cc
-		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) $(LM_CFLAGS) $(DEFS) -c $<
 
 #
 # To make it easy for the end user to use the embedded library we

No bundle (reason: useless for push emails).