bzr push into mysql-6.0-codebase-bugfixing branch (Alexey.Kopytov:3832 to 3833)

[Alexey Kopytov]

 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


Attachment: [text/bzr-bundle] bzr/[e-mail]