From: Alexey Kopytov
Date: March 19 2010 9:08am
Subject: bzr push into mysql-6.0-codebase-bugfixing branch (Alexey.Kopytov:3832
 to 3833)
List-Archive: http://lists.mysql.com/commits/103782
Message-Id: <20100319090823.B48946D248@kaamos.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_10nskKizMw9JAHEXmb/5XQ)"

--Boundary_(ID_10nskKizMw9JAHEXmb/5XQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

 3833 Alexey Kopytov	2010-03-19 [merge]
      Manual merge.

    modified:
      storage/example/Makefile.am
 3832 Alexey Kopytov	2010-03-19 [merge]
      Manual merge.

    modified:
      mysql-test/r/func_math.result
      mysql-test/r/func_misc.result
      mysql-test/r/func_test.result
      mysql-test/r/select.result
      mysql-test/r/select_jcl6.result
      mysql-test/r/sp.result
      mysql-test/r/strict.result
      mysql-test/r/type_newdecimal.result
      mysql-test/suite/sys_vars/r/sql_slave_skip_counter_basic.result
      mysql-test/suite/sys_vars/t/sql_slave_skip_counter_basic.test
      mysql-test/t/func_math.test
      mysql-test/t/func_misc.test
      mysql-test/t/func_test.test
      mysql-test/t/select.test
      mysql-test/t/sp.test
      mysql-test/t/strict.test
      mysql-test/t/type_newdecimal.test
      sql/item_create.cc
      sql/item_func.cc
      sql/item_func.h
      sql/share/errmsg-utf8.txt
=== modified file 'storage/example/Makefile.am'
--- a/storage/example/Makefile.am	2009-11-12 12:22:31 +0000
+++ b/storage/example/Makefile.am	2010-03-19 09:07:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2005-2006 MySQL AB
-#
+# Copyright (C) 2005-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+# All rights reserved.
 # 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; version 2 of the License.
@@ -46,12 +46,22 @@ libexample_a_SOURCES=	ha_example.cc
 EXTRA_DIST =		CMakeLists.txt plug.in
 
 if HAVE_DTRACE_DASH_G
+# The object for static and dynamic linking of example differ
+# For static linkage of example to mysqld
+# That's actually not needed as example is only dynamic loadable, but for completion
 libexample_a_LIBADD = probes_mysql.o
-libexample_a_DEPENDENCIES = probes_mysql.o
-CLEANFILES =
-BUILT_SOURCES =
-DTRACEFILES = libexample_a-ha_example.o
+libexample_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
+# For example as shared library
+ha_example_la_LIBADD = probes_sh_mysql.o
+# Hack: We "depend" on ".libs/" but have no rule for it,
+# but it is created as a byproduct of the ".lo"
+DTRACESHAREDDEPS = ha_example_la-ha_example.lo
+DTRACESHAREDFILES = ha_example_la-ha_example.o
 DTRACEPROVIDER = probes_mysql.d
+ha_example_la_DEPENDENCIES = probes_sh_mysql.o $(DTRACESHAREDDEPS) dtrace_providers
+
+CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers $(DTRACESHAREDFILES)
+DTRACEFILES = libexample_a-ha_example.c
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
@@ -62,6 +72,10 @@ probes_mysql.d:
 	$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
 	echo timestamp > dtrace_sources
 
+probes_sh_mysql.o: $(DTRACEPROVIDER) $(DTRACESHAREDDEPS)
+	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACESHAREDFILES) -o $@
+	$(CP) $(DTRACESHAREDFILES) .libs
 probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
+
 endif


--Boundary_(ID_10nskKizMw9JAHEXmb/5XQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/alexey.kopytov@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/alexey.kopytov@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexey.kopytov@stripped
# target_branch: file:///data/src/bzr/mysql-6.0-codebase-bugfixing/
# testament_sha1: aa398d616dd47f2910a834b4ee1dcc19d250a9e6
# timestamp: 2010-03-19 12:08:23 +0300
# source_branch: file:///data/src/bzr/mysql-next-mr-bugfixing/
# base_revision_id: alexey.kopytov@stripped\
#   y5iv1berpyolwir2
# 
# Begin bundle
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


--Boundary_(ID_10nskKizMw9JAHEXmb/5XQ)--