5.5-merge

2 files changed, 5 insertions, 88 deletions

diff --git a/sql-bench/CMakeLists.txt b/sql-bench/CMakeLists.txt
index f8be18c6653..ae05d30530d 100644
--- a/sql-bench/CMakeLists.txt
+++ b/sql-bench/CMakeLists.txt
@@ -26,13 +26,13 @@ ELSE()
 ENDIF()
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Data/ATIS
-  DESTINATION  ${prefix}sql-bench/Data)
+  DESTINATION  ${prefix}sql-bench/Data COMPONENT SqlBench)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Data/Wisconsin
-  DESTINATION  ${prefix}sql-bench/Data)
+  DESTINATION  ${prefix}sql-bench/Data COMPONENT SqlBench)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/limits
-  DESTINATION  ${prefix}sql-bench)
+  DESTINATION  ${prefix}sql-bench COMPONENT SqlBench)
 
 FILE(GLOB all_files ${CMAKE_CURRENT_SOURCE_DIR}/*)
 
@@ -54,10 +54,10 @@ FOREACH(file ${all_files})
   CONFIGURE_FILE(${file} ${target} COPYONLY)
   IF (ext MATCHES ".bat")
     IF(WIN32) 
-      INSTALL(FILES ${target} DESTINATION ${prefix}sql-bench)
+      INSTALL(FILES ${target} DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
     ENDIF()
   ELSE()
-    INSTALL(FILES ${target} DESTINATION ${prefix}sql-bench)
+    INSTALL(FILES ${target} DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
   ENDIF()
   ENDIF()
 ENDFOREACH()
diff --git a/sql-bench/Makefile.am b/sql-bench/Makefile.am
deleted file mode 100644
index a7a2975ea87..00000000000
--- a/sql-bench/Makefile.am
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright (C) 2000-2003, 2005 MySQL AB
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
-
-## Process this file with automake to create Makefile.in
-
-benchdir_root=		$(prefix)
-benchdir =		$(benchdir_root)/sql-bench
-bench_SCRIPTS =		test-ATIS test-connect test-create test-insert \
-			test-big-tables test-select test-wisconsin \
-			test-alter-table test-transactions \
-			graph-compare-results \
-			bench-init.pl compare-results run-all-tests \
-			server-cfg crash-me copy-db innotest1 innotest1a \
-			innotest1b innotest2 innotest2a innotest2b \
-			bench-count-distinct
-CLEANFILES =		$(bench_SCRIPTS)
-EXTRA_SCRIPTS =		test-ATIS.sh test-connect.sh test-create.sh \
-			test-insert.sh test-big-tables.sh test-select.sh \
-			test-alter-table.sh test-wisconsin.sh \
-			test-transactions.sh \
-			bench-init.pl.sh compare-results.sh server-cfg.sh \
-			run-all-tests.sh crash-me.sh copy-db.sh \
-			graph-compare-results.sh innotest1.sh innotest1a.sh \
-			innotest1b.sh innotest2.sh innotest2a.sh innotest2b.sh \
-			bench-count-distinct.sh
-EXTRA_DIST =		$(EXTRA_SCRIPTS) CMakeLists.txt
-
-dist-hook:
-	mkdir -p $(distdir)/Data/ATIS $(distdir)/Data/Wisconsin \
-		 $(distdir)/limits $(distdir)/Comments
-	for i in $(srcdir)/Data/ATIS/*.* ; do $(INSTALL_DATA) $$i $(distdir)/Data/ATIS ; done
-	for i in $(srcdir)/Data/Wisconsin/*.* ; do $(INSTALL_DATA) $$i $(distdir)/Data/Wisconsin ; done
-	for i in $(srcdir)/limits/*.* ; do $(INSTALL_DATA) $$i $(distdir)/limits; done
-	for i in $(srcdir)/Comments/*.* ; do $(INSTALL_DATA) $$i $(distdir)/Comments; done
-
-install-data-local:
-	$(mkinstalldirs) \
-		 $(DESTDIR)$(benchdir)/Data \
-		 $(DESTDIR)$(benchdir)/Data/ATIS \
-		 $(DESTDIR)$(benchdir)/Data/Wisconsin \
-		 $(DESTDIR)$(benchdir)/limits \
-		 $(DESTDIR)$(benchdir)/Comments
-	$(INSTALL_DATA) $(srcdir)/README  $(DESTDIR)$(benchdir)
-	for i in $(srcdir)/Data/ATIS/*.* ; do $(INSTALL_DATA) $$i $(DESTDIR)$(benchdir)/Data/ATIS ; done
-	for i in $(srcdir)/Data/Wisconsin/*.* ; do $(INSTALL_DATA) $$i $(DESTDIR)$(benchdir)/Data/Wisconsin ; done
-	for i in $(srcdir)/limits/*.* ; do $(INSTALL_DATA) $$i $(DESTDIR)$(benchdir)/limits; done
-	for i in $(srcdir)/Comments/*.* ; do $(INSTALL_DATA) $$i $(DESTDIR)$(benchdir)/Comments; done
-
-uninstall-local:
-	@RM@ -f -r $(DESTDIR)$(benchdir)
-
-SUFFIXES = .sh
-
-.sh:
-	@RM@ -f $@ $@-t
-	@SED@ \
-	  -e 's!@''benchdir''@!$(benchdir)!g' \
-	  -e 's!@''bindir''@!$(bindir)!g' \
-	  -e 's!@''scriptdir''@!$(bindir)!g' \
-	  -e 's!@''prefix''@!$(prefix)!g' \
-	  -e 's!@''datadir''@!$(datadir)!g' \
-	  -e 's!@''localstatedir''@!$(localstatedir)!g' \
-	  -e 's!@''libexecdir''@!$(libexecdir)!g' \
-	  -e 's!@''PERL''@!@PERL@!' \
-	  -e 's!@''VERSION''@!@VERSION@!' \
-	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-	  $< > $@-t
-	@CHMOD@ +x $@-t
-	@MV@ $@-t $@