Commit cdd07074 authored by unknown's avatar unknown
Browse files

Merge trift2.:/M50/clone-5.0 

into  trift2.:/M50/back23-5.0


support-files/mysql.spec.sh:
  Auto merged
parents e6f010b6 945d4606

support-files/mysql.spec.sh

+7 −2
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ then 
  cp -fp config.log "$MYSQL_MAXCONFLOG_DEST"

fi



make -i test-force || true

make -i test-force.pl || true



# Save mysqld-max

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

fi



make -i test-force || true

make -i test-force.pl || true



%install

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

# merging BK trees)

%changelog 

* Tue Jul 04 2006 Joerg Bruehe <joerg@mysql.com>



- Use the Perl script to run the tests, because it will automatically check

  whether the server is configured with SSL.



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



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