bk commit into 5.1 tree (kent:1.2320) BUG#21955

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-24 00:41:20+02:00, kent@stripped +2 -0
  mysql.spec.sh:
    Added "test" RPM package
    Install all binaries "make install" would
  make_binary_distribution.sh:
    Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)

  scripts/make_binary_distribution.sh@stripped, 2006-09-24 00:27:10+02:00, kent@stripped +2 -1
    Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)

  support-files/mysql.spec.sh@stripped, 2006-09-24 00:28:20+02:00, kent@stripped +17 -6
    Removed the rest of the "bench" sub RPM, but added a new "test" sub
    RPM containing the "mysql-test" directory earlier in the "bench" sub
    RPM. The new sub RPM "Obsoltes" "mysql-bench" as well.
    
    Added the rest of the binaries that "make install" would install
    
      bin/ndb_print_backup_file
      bin/ndb_print_schema_file
      bin/ndb_print_sys_file
      sbin/ndb_cpcd

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1

--- 1.127/scripts/make_binary_distribution.sh	2006-09-24 00:41:44 +02:00
+++ 1.128/scripts/make_binary_distribution.sh	2006-09-24 00:41:44 +02:00
@@ -331,7 +331,8 @@
   $CP $BASE/ndb-stage@bindir@/* $BASE/bin/.
   $CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.
   $CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.
-  $CP -r $BASE/ndb-stage@pkgincludedir@/ndb $BASE/include
+  test -d $BASE/include/storage || mkdir $BASE/include/storage
+  $CP -r $BASE/ndb-stage@pkgincludedir@/storage/ndb $BASE/include/storage/
   $CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. || exit 1
   rm -rf $BASE/ndb-stage
 fi

--- 1.164/support-files/mysql.spec.sh	2006-09-24 00:41:44 +02:00
+++ 1.165/support-files/mysql.spec.sh	2006-09-24 00:41:44 +02:00
@@ -165,16 +165,16 @@
 
 %{see_base}
 
-%package bench
+%package test
 Requires: %{name}-client perl-DBI perl
-Summary: MySQL - Benchmarks and test system
+Summary: MySQL - Test suite
 Group: Applications/Databases
-Provides: mysql-bench
-Obsoletes: mysql-bench
+Provides: mysql-test
+Obsoletes: mysql-bench mysql-test
 AutoReqProv: no
 
-%description bench
-This package contains MySQL benchmark scripts and data.
+%description test
+This package contains the MySQL regression test suite.
 
 %{see_base}
 
@@ -628,6 +628,9 @@
 %attr(755, root, root) %{_bindir}/ndb_config
 %attr(755, root, root) %{_bindir}/ndb_error_reporter
 %attr(755, root, root) %{_bindir}/ndb_size.pl
+%attr(755, root, root) %{_bindir}/ndb_print_backup_file
+%attr(755, root, root) %{_bindir}/ndb_print_schema_file
+%attr(755, root, root) %{_bindir}/ndb_print_sys_file
 %attr(-, root, root) %{_datadir}/mysql/ndb_size.tmpl
 
 %files ndb-extra
@@ -635,6 +638,7 @@
 %attr(755, root, root) %{_bindir}/ndb_drop_index
 %attr(755, root, root) %{_bindir}/ndb_drop_table
 %attr(755, root, root) %{_bindir}/ndb_delete_all
+%attr(755, root, root) %{_sbindir}/ndb_cpcd
 
 %files devel
 %defattr(-, root, root, 0755)
@@ -666,6 +670,13 @@
 # Shared libraries (omit for architectures that don't support them)
 %{_libdir}/libmysql*.so*
 %{_libdir}/libndb*.so*
+
+%files test
+%defattr(-, root, root, 0755)
+%attr(-, root, root) %{_datadir}/mysql-test
+%attr(755, root, root) %{_bindir}/mysql_client_test
+%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
+%attr(755, root, root) %{_bindir}/mysqltest_embedded
 
 %files embedded
 %defattr(-, root, root, 0755)