diff options
author | unknown <evgen@moonbone.local> | 2006-06-28 19:34:04 +0400 |
---|---|---|
committer | unknown <evgen@moonbone.local> | 2006-06-28 19:34:04 +0400 |
commit | a68075513a87c9b75e4b7165221a79d9e08c056d (patch) | |
tree | 3c5baf35e4a619852c09b91014b8172b38a30001 /support-files | |
parent | e2bf3f0318b9b641127ff63c2f8e2b282554cf39 (diff) | |
parent | 907acc785da95878f0ff7eb6a5b88b5b18e713a8 (diff) | |
download | mariadb-git-a68075513a87c9b75e4b7165221a79d9e08c056d.tar.gz |
Manual merge
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
sql/field.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'support-files')
-rw-r--r-- | support-files/mysql.spec.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 501403a0880..72e230da0c2 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -148,6 +148,19 @@ They should be used with caution. %{see_base} +%package bench +Requires: %{name}-client perl-DBI perl +Summary: MySQL - Benchmarks and test system +Group: Applications/Databases +Provides: mysql-bench +Obsoletes: mysql-bench +AutoReqProv: no + +%description bench +This package contains MySQL benchmark scripts and data. + +%{see_base} + %package devel Summary: MySQL - Development header files and libraries Group: Applications/Databases |