Skip to content

Commit 35edc02

Browse files
trostenAkhil Mohan
trosten
authored and
Akhil Mohan
committed
WL8406 Remove sql-bench
1 parent d4706e7 commit 35edc02

File tree

105 files changed

+2
-66402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+2
-66402
lines changed

‎.bzrignore

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1897,34 +1897,6 @@ server-tools/instance-manager/protocol.cpp
18971897
server-tools/instance-manager/thr_alarm.c
18981898
server-tools/instance-manager/thread_registry.cpp
18991899
server-tools/instance-manager/user_map.cpp
1900-
sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
1901-
sql-bench/bench-count-distinct
1902-
sql-bench/bench-init.pl
1903-
sql-bench/compare-results
1904-
sql-bench/compare-results-all
1905-
sql-bench/copy-db
1906-
sql-bench/crash-me
1907-
sql-bench/gif/*
1908-
sql-bench/graph-compare-results
1909-
sql-bench/innotest1
1910-
sql-bench/innotest1a
1911-
sql-bench/innotest1b
1912-
sql-bench/innotest2
1913-
sql-bench/innotest2a
1914-
sql-bench/innotest2b
1915-
sql-bench/output/*
1916-
sql-bench/run-all-tests
1917-
sql-bench/server-cfg
1918-
sql-bench/template.html
1919-
sql-bench/test-ATIS
1920-
sql-bench/test-alter-table
1921-
sql-bench/test-big-tables
1922-
sql-bench/test-connect
1923-
sql-bench/test-create
1924-
sql-bench/test-insert
1925-
sql-bench/test-select
1926-
sql-bench/test-transactions
1927-
sql-bench/test-wisconsin
19281900
sql/*.cpp
19291901
sql/*.ds?
19301902
sql/*.def

‎.gitignore

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1902,34 +1902,6 @@ server-tools/instance-manager/protocol.cpp
19021902
server-tools/instance-manager/thr_alarm.c
19031903
server-tools/instance-manager/thread_registry.cpp
19041904
server-tools/instance-manager/user_map.cpp
1905-
sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
1906-
sql-bench/bench-count-distinct
1907-
sql-bench/bench-init.pl
1908-
sql-bench/compare-results
1909-
sql-bench/compare-results-all
1910-
sql-bench/copy-db
1911-
sql-bench/crash-me
1912-
sql-bench/gif/*
1913-
sql-bench/graph-compare-results
1914-
sql-bench/innotest1
1915-
sql-bench/innotest1a
1916-
sql-bench/innotest1b
1917-
sql-bench/innotest2
1918-
sql-bench/innotest2a
1919-
sql-bench/innotest2b
1920-
sql-bench/output/*
1921-
sql-bench/run-all-tests
1922-
sql-bench/server-cfg
1923-
sql-bench/template.html
1924-
sql-bench/test-ATIS
1925-
sql-bench/test-alter-table
1926-
sql-bench/test-big-tables
1927-
sql-bench/test-connect
1928-
sql-bench/test-create
1929-
sql-bench/test-insert
1930-
sql-bench/test-select
1931-
sql-bench/test-transactions
1932-
sql-bench/test-wisconsin
19331905
sql/*.cpp
19341906
sql/*.ds?
19351907
sql/*.def

‎CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,6 @@ IF(NOT WITHOUT_SERVER)
541541
ADD_SUBDIRECTORY(mysql-test)
542542
ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
543543
ADD_SUBDIRECTORY(support-files)
544-
ADD_SUBDIRECTORY(sql-bench)
545544
IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
546545
ADD_SUBDIRECTORY(internal)
547546
ENDIF()

‎cmake/install_layout.cmake

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
# - INSTALL_SHAREDIR (location of aclocal/mysql.m4)
6969
# - INSTALL_MYSQLSHAREDIR (MySQL character sets and localized error messages)
7070
# - INSTALL_MYSQLTESTDIR (mysql-test)
71-
# - INSTALL_SQLBENCHDIR (sql-bench)
7271
# - INSTALL_SUPPORTFILESDIR (various extra support files)
7372
#
7473
# - INSTALL_MYSQLDATADIR (data directory)
@@ -170,7 +169,6 @@ SET(INSTALL_INFODIR_STANDALONE "docs")
170169
SET(INSTALL_SHAREDIR_STANDALONE "share")
171170
SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share")
172171
SET(INSTALL_MYSQLTESTDIR_STANDALONE "mysql-test")
173-
SET(INSTALL_SQLBENCHDIR_STANDALONE ".")
174172
SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files")
175173
#
176174
SET(INSTALL_MYSQLDATADIR_STANDALONE "data")
@@ -198,7 +196,6 @@ SET(INSTALL_INFODIR_WIN "docs")
198196
SET(INSTALL_SHAREDIR_WIN "share")
199197
SET(INSTALL_MYSQLSHAREDIR_WIN "share")
200198
SET(INSTALL_MYSQLTESTDIR_WIN "mysql-test")
201-
SET(INSTALL_SQLBENCHDIR_WIN ".")
202199
SET(INSTALL_SUPPORTFILESDIR_WIN "support-files")
203200
#
204201
SET(INSTALL_MYSQLDATADIR_WIN "data")
@@ -226,7 +223,6 @@ SET(INSTALL_INFODIR_FREEBSD "docs")
226223
SET(INSTALL_SHAREDIR_FREEBSD "share")
227224
SET(INSTALL_MYSQLSHAREDIR_FREEBSD "share")
228225
SET(INSTALL_MYSQLTESTDIR_FREEBSD "mysql-test")
229-
SET(INSTALL_SQLBENCHDIR_FREEBSD ".")
230226
SET(INSTALL_SUPPORTFILESDIR_FREEBSD "support-files")
231227
#
232228
SET(INSTALL_MYSQLDATADIR_FREEBSD "data")
@@ -254,7 +250,6 @@ SET(INSTALL_INFODIR_GLIBC "docs")
254250
SET(INSTALL_SHAREDIR_GLIBC "share")
255251
SET(INSTALL_MYSQLSHAREDIR_GLIBC "share")
256252
SET(INSTALL_MYSQLTESTDIR_GLIBC "mysql-test")
257-
SET(INSTALL_SQLBENCHDIR_GLIBC ".")
258253
SET(INSTALL_SUPPORTFILESDIR_GLIBC "support-files")
259254
#
260255
SET(INSTALL_MYSQLDATADIR_GLIBC "data")
@@ -282,7 +277,6 @@ SET(INSTALL_INFODIR_OSX "docs")
282277
SET(INSTALL_SHAREDIR_OSX "share")
283278
SET(INSTALL_MYSQLSHAREDIR_OSX "share")
284279
SET(INSTALL_MYSQLTESTDIR_OSX "mysql-test")
285-
SET(INSTALL_SQLBENCHDIR_OSX ".")
286280
SET(INSTALL_SUPPORTFILESDIR_OSX "support-files")
287281
#
288282
SET(INSTALL_MYSQLDATADIR_OSX "data")
@@ -310,7 +304,6 @@ SET(INSTALL_INFODIR_TARGZ "docs")
310304
SET(INSTALL_SHAREDIR_TARGZ "share")
311305
SET(INSTALL_MYSQLSHAREDIR_TARGZ "share")
312306
SET(INSTALL_MYSQLTESTDIR_TARGZ "mysql-test")
313-
SET(INSTALL_SQLBENCHDIR_TARGZ ".")
314307
SET(INSTALL_SUPPORTFILESDIR_TARGZ "support-files")
315308
#
316309
SET(INSTALL_MYSQLDATADIR_TARGZ "data")
@@ -347,7 +340,6 @@ SET(INSTALL_MANDIR_RPM "share/man")
347340
SET(INSTALL_SHAREDIR_RPM "share")
348341
SET(INSTALL_MYSQLSHAREDIR_RPM "share/mysql")
349342
SET(INSTALL_MYSQLTESTDIR_RPM "share/mysql-test")
350-
SET(INSTALL_SQLBENCHDIR_RPM "")
351343
SET(INSTALL_SUPPORTFILESDIR_RPM "share/mysql")
352344
#
353345
SET(INSTALL_MYSQLDATADIR_RPM "/var/lib/mysql")
@@ -380,7 +372,6 @@ SET(INSTALL_MANDIR_SLES "share/man")
380372
SET(INSTALL_SHAREDIR_SLES "share")
381373
SET(INSTALL_MYSQLSHAREDIR_SLES "share/mysql")
382374
SET(INSTALL_MYSQLTESTDIR_SLES "share/mysql-test")
383-
SET(INSTALL_SQLBENCHDIR_SLES "")
384375
SET(INSTALL_SUPPORTFILESDIR_SLES "share/mysql")
385376
#
386377
SET(INSTALL_MYSQLDATADIR_SLES "/var/lib/mysql")
@@ -408,7 +399,6 @@ SET(INSTALL_INFODIR_DEB "docs")
408399
SET(INSTALL_SHAREDIR_DEB "share")
409400
SET(INSTALL_MYSQLSHAREDIR_DEB "share")
410401
SET(INSTALL_MYSQLTESTDIR_DEB "mysql-test")
411-
SET(INSTALL_SQLBENCHDIR_DEB ".")
412402
SET(INSTALL_SUPPORTFILESDIR_DEB "support-files")
413403
#
414404
SET(INSTALL_MYSQLDATADIR_DEB "/var/lib/mysql")
@@ -436,7 +426,6 @@ SET(INSTALL_INFODIR_SVR4 "docs")
436426
SET(INSTALL_SHAREDIR_SVR4 "share")
437427
SET(INSTALL_MYSQLSHAREDIR_SVR4 "share")
438428
SET(INSTALL_MYSQLTESTDIR_SVR4 "mysql-test")
439-
SET(INSTALL_SQLBENCHDIR_SVR4 ".")
440429
SET(INSTALL_SUPPORTFILESDIR_SVR4 "support-files")
441430
#
442431
SET(INSTALL_MYSQLDATADIR_SVR4 "/var/lib/mysql")
@@ -457,8 +446,8 @@ SET(OLD_INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE INTERNAL "")
457446
# will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
458447
# layout is chosen)
459448
FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
460-
INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST
461-
SECURE_FILE_PRIV SECURE_FILE_PRIV_EMBEDDED)
449+
INFO MYSQLTEST DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST
450+
SECURE_FILE_PRIV)
462451
SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
463452
CACHE STRING "${var} installation directory" ${FORCE})
464453
MARK_AS_ADVANCED(INSTALL_${var}DIR)

‎config.h.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@
251251
#cmakedefine INSTALL_PLUGINTESTDIR "@INSTALL_PLUGINTESTDIR@"
252252
#cmakedefine INSTALL_INFODIR "@default_prefix@/@INSTALL_INFODIR@"
253253
#cmakedefine INSTALL_MYSQLTESTDIR "@default_prefix@/@INSTALL_MYSQLTESTDIR@"
254-
#cmakedefine INSTALL_SQLBENCHDIR "@default_prefix@/@INSTALL_SQLBENCHDIR@"
255254
#cmakedefine INSTALL_DOCREADMEDIR "@default_prefix@/@INSTALL_DOCREADMEDIR@"
256255
#cmakedefine INSTALL_DOCDIR "@default_prefix@/@INSTALL_DOCDIR@"
257256
#cmakedefine INSTALL_MANDIR "@default_prefix@/@INSTALL_MANDIR@"

‎packaging/WiX/create_msi.cmake.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ LIST(APPEND EXCLUDE_DIRS
7171
lib/plugin/debug
7272
mysql-test
7373
scripts
74-
sql-bench
7574
)
7675

7776
LIST(APPEND EXCLUDE_FILES

‎packaging/rpm-fedora/mysql.spec.in

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -216,26 +216,6 @@ Provides: mysql-test%{?_isa} = %{version}-%{release}
216216
This package contains the MySQL regression test suite for MySQL
217217
database server.
218218

219-
220-
%package bench
221-
Summary: MySQL benchmark suite
222-
Group: Applications/Databases
223-
%if 0%{?commercial}
224-
Obsoletes: mysql-community-bench < %{version}-%{release}
225-
Requires: mysql-commercial-server%{?_isa} = %{version}-%{release}
226-
%else
227-
Requires: mysql-community-server%{?_isa} = %{version}-%{release}
228-
%endif
229-
Obsoletes: mariadb-bench
230-
Obsoletes: community-mysql-bench < %{version}-%{release}
231-
Obsoletes: mysql-bench < %{version}-%{release}
232-
Provides: mysql-bench = %{version}-%{release}
233-
Provides: mysql-bench%{?_isa} = %{version}-%{release}
234-
235-
%description bench
236-
This package contains the MySQL Benchmark Suite for MySQL database
237-
server.
238-
239219
%package devel
240220
Summary: Development header files and libraries for MySQL database client applications
241221
Group: Applications/Databases
@@ -412,7 +392,6 @@ mkdir debug
412392
-DWITH_INNODB_MEMCACHED=1 \
413393
-DINSTALL_LIBDIR="%{_lib}/mysql" \
414394
-DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
415-
-DINSTALL_SQLBENCHDIR=share \
416395
-DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
417396
-DFEATURE_SET="%{feature_set}" \
418397
-DWITH_EMBEDDED_SERVER=1 \
@@ -440,7 +419,6 @@ mkdir release
440419
-DWITH_INNODB_MEMCACHED=1 \
441420
-DINSTALL_LIBDIR="%{_lib}/mysql" \
442421
-DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
443-
-DINSTALL_SQLBENCHDIR=share \
444422
-DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
445423
-DFEATURE_SET="%{feature_set}" \
446424
-DWITH_EMBEDDED_SERVER=1 \
@@ -773,11 +751,6 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
773751
%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
774752
%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
775753

776-
%files bench
777-
%defattr(-, root, root, -)
778-
%doc %{?license_files_server}
779-
%{_datadir}/sql-bench
780-
781754
%files embedded
782755
%defattr(-, root, root, -)
783756
%doc %{?license_files_server}

‎packaging/rpm-oel/mysql.spec.in

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -280,26 +280,6 @@ Provides: mysql-test%{?_isa} = %{version}-%{release}
280280
This package contains the MySQL regression test suite for MySQL
281281
database server.
282282

283-
284-
%package bench
285-
Summary: MySQL benchmark suite
286-
Group: Applications/Databases
287-
%if 0%{?commercial}
288-
Obsoletes: mysql-community-bench < %{version}-%{release}
289-
Requires: mysql-commercial-server%{?_isa} = %{version}-%{release}
290-
%else
291-
Requires: mysql-community-server%{?_isa} = %{version}-%{release}
292-
%endif
293-
Obsoletes: mariadb-bench
294-
Obsoletes: community-mysql-bench < %{version}-%{release}
295-
Obsoletes: mysql-bench < %{version}-%{release}
296-
Provides: mysql-bench = %{version}-%{release}
297-
Provides: mysql-bench%{?_isa} = %{version}-%{release}
298-
299-
%description bench
300-
This package contains the MySQL Benchmark Suite for MySQL database
301-
server.
302-
303283
%package devel
304284
Summary: Development header files and libraries for MySQL database client applications
305285
Group: Applications/Databases
@@ -569,7 +549,6 @@ mkdir debug
569549
-DWITH_INNODB_MEMCACHED=1 \
570550
-DINSTALL_LIBDIR="%{_lib}/mysql" \
571551
-DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
572-
-DINSTALL_SQLBENCHDIR=share \
573552
-DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
574553
-DFEATURE_SET="%{feature_set}" \
575554
-DWITH_EMBEDDED_SERVER=1 \
@@ -599,7 +578,6 @@ mkdir release
599578
-DWITH_INNODB_MEMCACHED=1 \
600579
-DINSTALL_LIBDIR="%{_lib}/mysql" \
601580
-DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
602-
-DINSTALL_SQLBENCHDIR=share \
603581
-DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
604582
-DFEATURE_SET="%{feature_set}" \
605583
-DWITH_EMBEDDED_SERVER=1 \
@@ -992,11 +970,6 @@ fi
992970
%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
993971
%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
994972

995-
%files bench
996-
%defattr(-, root, root, -)
997-
%doc %{?license_files_server}
998-
%{_datadir}/sql-bench
999-
1000973
%files embedded
1001974
%defattr(-, root, root, -)
1002975
%doc %{?license_files_server}

‎packaging/rpm-sles/mysql.spec.in

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -243,26 +243,6 @@ Conflicts: otherproviders(mysql-test)
243243
This package contains the MySQL regression test suite for MySQL
244244
database server.
245245

246-
247-
%package bench
248-
Summary: MySQL benchmark suite
249-
Group: Applications/Databases
250-
%if 0%{?commercial}
251-
Obsoletes: mysql-community-bench < %{version}-%{release}
252-
Requires: mysql-commercial-server = %{version}-%{release}
253-
%else
254-
Requires: mysql-community-server = %{version}-%{release}
255-
%endif
256-
Obsoletes: mariadb-bench
257-
Obsoletes: community-mysql-bench < %{version}-%{release}
258-
Obsoletes: mysql-bench < %{version}-%{release}
259-
Provides: mysql-bench = %{version}-%{release}
260-
Conflicts: otherproviders(mysql-bench)
261-
262-
%description bench
263-
This package contains the MySQL Benchmark Suite for MySQL database
264-
server.
265-
266246
%package devel
267247
Summary: Development header files and libraries for MySQL database client applications
268248
Group: Applications/Databases
@@ -398,7 +378,6 @@ mkdir debug
398378
-DWITH_INNODB_MEMCACHED=1 \
399379
-DINSTALL_LIBDIR="%{_lib}/mysql" \
400380
-DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
401-
-DINSTALL_SQLBENCHDIR=share \
402381
-DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
403382
-DFEATURE_SET="%{feature_set}" \
404383
-DWITH_EMBEDDED_SERVER=1 \
@@ -430,7 +409,6 @@ mkdir release
430409
-DWITH_INNODB_MEMCACHED=1 \
431410
-DINSTALL_LIBDIR="%{_lib}/mysql" \
432411
-DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
433-
-DINSTALL_SQLBENCHDIR=share \
434412
-DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
435413
-DFEATURE_SET="%{feature_set}" \
436414
-DWITH_EMBEDDED_SERVER=1 \
@@ -819,11 +797,6 @@ fi
819797
%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
820798
%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
821799

822-
%files bench
823-
%defattr(-, root, root, -)
824-
%doc %{?license_files_server}
825-
%{_datadir}/sql-bench
826-
827800
%files embedded
828801
%defattr(-, root, root, -)
829802
%doc %{?license_files_server}

0 commit comments

Comments
 (0)