Commit 16599454 authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M41/mysql-4.1 

into  trift2.:/MySQL/M41/push-4.1
parents 6bd194d7 aa13653a

support-files/mysql.spec.sh

+21 −2
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@ necessary to develop MySQL client applications. 
%package shared

Summary: MySQL - Shared libraries

Group: Applications/Databases

Provides: mysql-shared

Obsoletes: mysql-shared



%description shared

This package contains the shared libraries (*.so*) which certain
@@ -317,7 +319,10 @@ then 
  cp -fp config.log "$MYSQL_MAXCONFLOG_DEST"

fi



make -i test-force || true

( cd mysql-test

  perl ./mysql-test-run.pl --force --report-features

  perl ./mysql-test-run.pl --force --ps-protocol

  true )



# Save mysqld-max

./libtool --mode=execute cp sql/mysqld sql/mysqld-max
@@ -380,7 +385,10 @@ then 
  cp -fp config.log "$MYSQL_CONFLOG_DEST"

fi



make -i test-force || true

( cd mysql-test

  perl ./mysql-test-run.pl --force --report-features

  perl ./mysql-test-run.pl --force --ps-protocol

  true )



%install

RBR=$RPM_BUILD_ROOT
@@ -716,6 +724,17 @@ fi 
# itself - note that they must be ordered by date (important when

# merging BK trees)

%changelog 

* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>



- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) 

  replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading

  (bug#22081).



* Wed Nov 15 2006 Joerg Bruehe <joerg@mysql.com>



- Switch from "make test*" to explicit calls of the test suite,

  so that "report features" can be used.



* Tue Jun 27 2006 Joerg Bruehe <joerg@mysql.com>



- move "mysqldumpslow" from the client RPM to the server RPM (bug#20216)