List:Commits« Previous MessageNext Message »
From:Horst.Hunger Date:April 14 2010 5:55am
Subject:bzr commit into mysql-next-mr-bugfixing branch (horst.hunger:3152)
View as plain text  
#At file:///home/horst/bzr/next-mr-47739-4/ based on revid:kostja@stripped

 3152 Horst.Hunger	2010-04-14
      Patch including review results again due to merge.

    added:
      mysql-test/include/have_archive_plugin.inc
      mysql-test/r/archive_plugin.result
      mysql-test/t/archive_plugin-master.opt
      mysql-test/t/archive_plugin.test
    modified:
      storage/archive/Makefile.am
=== added file 'mysql-test/include/have_archive_plugin.inc'
--- a/mysql-test/include/have_archive_plugin.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/have_archive_plugin.inc	2010-04-14 05:55:05 +0000
@@ -0,0 +1,5 @@
+if (`select plugin_library IS NULL from information_schema.plugins where plugin_name LIKE '%archive%'`)
+{
+  --skip archive plugin not available
+}
+

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

=== added file 'mysql-test/t/archive_plugin-master.opt'
--- a/mysql-test/t/archive_plugin-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/archive_plugin-master.opt	2010-04-14 05:55:05 +0000
@@ -0,0 +1 @@
+--plugin_dir=../storage/archive/.libs

=== added file 'mysql-test/t/archive_plugin.test'
--- a/mysql-test/t/archive_plugin.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/archive_plugin.test	2010-04-14 05:55:05 +0000
@@ -0,0 +1,23 @@
+--source include/not_windows.inc
+--source include/have_archive_plugin.inc
+
+CREATE TABLE t1(a int) ENGINE=ARCHIVE;
+DROP TABLE t1;
+
+INSTALL PLUGIN archive SONAME 'ha_archive.so';
+--error 1125
+INSTALL PLUGIN ARCHIVE SONAME 'ha_archive.so';
+
+UNINSTALL PLUGIN archive;
+
+INSTALL PLUGIN archive SONAME 'ha_archive.so';
+
+CREATE TABLE t1(a int) ENGINE=ARCHIVE;
+
+DROP TABLE t1;
+
+UNINSTALL PLUGIN archive;
+
+--error ER_SP_DOES_NOT_EXIST 
+UNINSTALL PLUGIN archive;
+

=== modified file 'storage/archive/Makefile.am'
--- a/storage/archive/Makefile.am	2009-11-13 22:07:41 +0000
+++ b/storage/archive/Makefile.am	2010-04-14 05:55:05 +0000
@@ -71,24 +71,23 @@ EXTRA_DIST =		CMakeLists.txt plug.in
 if HAVE_DTRACE_DASH_G
 # The object for static and dynamic linking of archive differ 
 # For static linkage of archive to mysqld 
+
 libarchive_a_LIBADD = probes_mysql.o
 libarchive_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
 # For archive as shared library 
 ha_archive_la_LIBADD = probes_sh_mysql.o
-ha_archive_la_DEPENDENCIES = probes_sh_mysql.o dtrace_shared_files dtrace_providers
-
-CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers dtrace_shared_files dtrace_sources
-DTRACEFILES = libarchive_a-ha_archive.o
-DTRACESHAREDFILES = .libs/ha_archive_la-ha_archive.o
 # Hack: We "depend" on ".libs/" but have no rule for it,
 # but it is created as a byproduct of the ".lo"
-DTRACESHAREDDEPEND = ha_archive_la-ha_archive.lo
+DTRACESHAREDDEPS = ha_archive_la-ha_archive.lo
+DTRACESHAREDFILES = ha_archive_la-ha_archive.o
 DTRACEPROVIDER = probes_mysql.d
+ha_archive_la_DEPENDENCIES = probes_sh_mysql.o $(DTRACESHAREDDEPS) dtrace_providers
+
+CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers $(DTRACESHAREDFILES)
+DTRACEFILES = libarchive_a-ha_archive.o
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
-dtrace_shared_files:
-	echo $(DTRACESHAREDFILES) > $@
 dtrace_providers: probes_mysql.d
 	echo $(DTRACEPROVIDER) > $@
 probes_mysql.d:
@@ -96,11 +95,12 @@ probes_mysql.d:
 	$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
 	echo timestamp > dtrace_sources
 
-probes_sh_mysql.o: $(DTRACEPROVIDER) $(DTRACESHAREDDEPEND)
+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


Attachment: [text/bzr-bundle] bzr/horst.hunger@sun.com-20100414055505-pb8ucxndpa89ilmu.bundle
Thread
bzr commit into mysql-next-mr-bugfixing branch (horst.hunger:3152) Horst.Hunger14 Apr