maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Michael Widenius (monty)
  Sergey Petrunia (sergefp)
------------------------------------------------------------
revno: 2754 [merge]
committer: Michael Widenius <monty@xxxxxxxxxxxx>
branch nick: maria-5.1
timestamp: Fri 2009-10-30 22:28:11 +0200
message:
  Merge with 5.1-release
modified:
  scripts/make_binary_distribution.sh
  win/make_mariadb_win_dist


--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

=== modified file 'scripts/make_binary_distribution.sh'
--- scripts/make_binary_distribution.sh	2009-10-29 00:04:56 +0000
+++ scripts/make_binary_distribution.sh	2009-10-30 20:28:11 +0000
@@ -305,11 +305,6 @@
     fi
   fi
 
-  # FIXME let this script be in "bin/", where it is in the RPMs?
-  # http://dev.mysql.com/doc/refman/5.1/en/mysql-install-db-problems.html
-  mkdir $DEST/scripts
-  mv $DEST/bin/mysql_install_db $DEST/scripts/
-
   # Note, no legacy "safe_mysqld" link to "mysqld_safe" in 5.1
 
   # Copy readme and license files
@@ -342,18 +337,25 @@
   #
   # Move things to make them easier to find in tar installation
   #
-  mv $DEST/libexec/* $DEST/bin
+
+  # The following test is needed if the original configure was done with
+  # something like --libexecdir=/usr/local/mysql/bin
+  if test -f $DEST/libexec/mysqld
+  then
+    mv $DEST/libexec/* $DEST/bin
+    rmdir $DEST/libexec
+  fi
   mv $DEST/share/man $DEST
   mv $DEST/share/mysql/binary-configure $DEST/configure
   mv $DEST/share/mysql/*.sql $DEST/share
   mv $DEST/share/mysql/*.cnf $DEST/share/mysql/*.server $DEST/share/mysql/mysql-log-rotate $DEST/support-files
-  rmdir $DEST/libexec
 
   #
   # Move some scripts that are only run once to 'scripts' directory
   # but add symbolic links instead to old place for compatibility
   #
-  for i in mysql_secure_installation mysql_fix_extensions mysql_fix_privilege_tables
+  mkdir $DEST/scripts
+  for i in mysql_secure_installation mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db
   do
     mv $DEST/bin/$i $DEST/scripts
     ln -s "../scripts/$i" $DEST/bin/$i

=== modified file 'win/make_mariadb_win_dist'
--- win/make_mariadb_win_dist	2009-10-12 16:50:20 +0000
+++ win/make_mariadb_win_dist	2009-10-30 10:50:48 +0000
@@ -66,7 +66,7 @@
 echo "$ZIPFILE is the Windows noinstall binary zip"
 
 if [ $RES ] ; then
- echo "Archive contents differ from the standard file list, check the diff output above"
+  echo "Archive contents differ from the standard file list, check the diff output above"
 else
   echo "Archive contents match the standard list, OK"
 fi