From: Horst.Hunger
Date: April 21 2010 9:17am
Subject: bzr push into mysql-next-mr-bugfixing branch (horst.hunger:3144)
List-Archive: http://lists.mysql.com/commits/106206
Message-Id: <20100421091731.1502AB266C@hh-nb-t.hungers>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0836073798434637341=="

--===============0836073798434637341==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3144 Horst.Hunger	2010-04-21 [merge]
      due to merge needed to push.

    modified:
      mysql-test/r/innodb_mysql_sync.result
      mysql-test/r/lock_sync.result
      mysql-test/r/myisam.result
      mysql-test/r/show_check.result
      mysql-test/r/sp-lock.result
      mysql-test/r/sp_sync.result
      mysql-test/suite/perfschema/r/misc.result
      mysql-test/suite/perfschema/t/misc.test
      mysql-test/t/disabled.def
      mysql-test/t/innodb_mysql_sync.test
      mysql-test/t/lock_sync.test
      mysql-test/t/myisam.test
      mysql-test/t/show_check.test
      mysql-test/t/sp-lock.test
      mysql-test/t/sp_sync.test
      sql/event_scheduler.cc
      sql/handler.cc
      sql/sql_base.cc
      sql/sql_parse.cc
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_update.cc
      sql/sys_vars.cc
      storage/myisam/ha_myisam.h
      storage/perfschema/pfs_engine_table.cc
=== added file 'mysql-test/include/have_blackhole_plugin.inc'
--- a/mysql-test/include/have_blackhole_plugin.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/have_blackhole_plugin.inc	2010-04-21 07:21:42 +0000
@@ -0,0 +1,5 @@
+if (`select plugin_library IS NULL from information_schema.plugins where plugin_name LIKE '%blackhole%'`)
+{
+  --skip blackhole plugin not available;
+}
+

=== added file 'mysql-test/r/blackhole_plugin.result'
--- a/mysql-test/r/blackhole_plugin.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/blackhole_plugin.result	2010-04-21 07:21:42 +0000
@@ -0,0 +1,15 @@
+CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
+Warnings:
+Warning	1286	Unknown storage engine 'BLACKHOLE'
+Warning	1266	Using storage engine MyISAM for table 't1'
+DROP TABLE t1;
+INSTALL PLUGIN blackhole SONAME 'ha_blackhole.so';
+INSTALL PLUGIN BLACKHOLE SONAME 'ha_blackhole.so';
+ERROR HY000: Function 'BLACKHOLE' already exists
+UNINSTALL PLUGIN blackhole;
+INSTALL PLUGIN blackhole SONAME 'ha_blackhole.so';
+CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
+DROP TABLE t1;
+UNINSTALL PLUGIN blackhole;
+UNINSTALL PLUGIN blackhole;
+ERROR 42000: PLUGIN blackhole does not exist

=== added file 'mysql-test/t/blackhole_plugin-master.opt'
--- a/mysql-test/t/blackhole_plugin-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/blackhole_plugin-master.opt	2010-04-21 07:21:42 +0000
@@ -0,0 +1 @@
+--plugin_dir=../storage/blackhole/.libs

=== added file 'mysql-test/t/blackhole_plugin.test'
--- a/mysql-test/t/blackhole_plugin.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/blackhole_plugin.test	2010-04-21 07:21:42 +0000
@@ -0,0 +1,22 @@
+--source include/not_windows.inc
+--source include/have_blackhole_plugin.inc
+
+CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
+DROP TABLE t1;
+
+eval INSTALL PLUGIN blackhole SONAME 'ha_blackhole.so';
+--error 1125
+eval INSTALL PLUGIN BLACKHOLE SONAME 'ha_blackhole.so';
+
+UNINSTALL PLUGIN blackhole;
+
+eval INSTALL PLUGIN blackhole SONAME 'ha_blackhole.so';
+
+CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
+
+DROP TABLE t1;
+
+UNINSTALL PLUGIN blackhole;
+--error ER_SP_DOES_NOT_EXIST
+UNINSTALL PLUGIN blackhole;
+

=== modified file 'storage/blackhole/Makefile.am'
--- a/storage/blackhole/Makefile.am	2009-03-18 10:04:15 +0000
+++ b/storage/blackhole/Makefile.am	2010-04-21 07:21:42 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 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.
@@ -50,11 +50,22 @@ libblackhole_a_SOURCES=	ha_blackhole.cc
 EXTRA_DIST =		CMakeLists.txt plug.in
 
 if HAVE_DTRACE_DASH_G
+# The object for static and dynamic linking of blackhole differ
+# For static linkage of blackhole to mysqld
+
 libblackhole_a_LIBADD = probes_mysql.o
 libblackhole_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
-CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
-DTRACEFILES = libblackhole_a-ha_blackhole.o
+# For blackhole as shared library
+ha_blackhole_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_blackhole_la-ha_blackhole.lo
+DTRACESHAREDFILES = ha_blackhole_la-ha_blackhole.o
 DTRACEPROVIDER = probes_mysql.d
+ha_blackhole_la_DEPENDENCIES = probes_sh_mysql.o $(DTRACESHAREDDEPS) dtrace_providers
+
+CLEANFILES = $(DTRACEPROVIDERS) dtrace_files dtrace_providers $(DTRACESHAREDDEPS)
+DTRACEFILES = libblackhole_a-ha_blackhole.o
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
@@ -65,8 +76,12 @@ 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
 
 # Don't update the files from bitkeeper


--===============0836073798434637341==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/horst.hunger@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: horst.hunger@stripped
# target_branch: file:///home/horst/bzr/next-mr-47748-2/
# testament_sha1: 2f091e1bb36a7358fa31c66d87f1081c25014ab8
# timestamp: 2010-04-21 11:17:31 +0200
# source_branch: bzr+ssh://hhunger@stripped/bzrroot\
#   /server/mysql-next-mr-bugfixing/
# base_revision_id: jon.hauglid@stripped\
#   q7uas9y67y1xgwub
# 
# Begin bundle
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
jA6LwXy2lSArI9jAN4u5IpwoSFivhw0A


--===============0836073798434637341==--