Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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
1.2338 06/04/12 17:00:15 jimw@stripped +30 -0
Rename files named .sh that aren't really /bin/sh scripts to .in, and
make sure mysql-multi.server.sh is turned into mysql-multi.server (just
like mysql-server.sh is). Also, remove the redundant mysqld_multi.server.sh
scripts/mysqld_multi.in
1.31 06/04/12 16:42:10 jimw@stripped +8 -8
Point at mysql-multi.server instead of mysqld_multi.server.sh
scripts/fill_func_tables.in
1.7 06/04/12 16:39:07 jimw@stripped +1 -1
Replace path to perl executable
scripts/Makefile.am
1.54 06/04/12 16:38:57 jimw@stripped +12 -12
Handle non-sh files being renamed to use .in
scripts/fill_help_tables.in
1.17 06/04/12 16:35:47 jimw@stripped +0 -0
Rename: scripts/fill_help_tables.sh -> scripts/fill_help_tables.in
scripts/mysqlaccess.in
1.11 06/04/12 16:35:29 jimw@stripped +0 -0
Rename: scripts/mysqlaccess.sh -> scripts/mysqlaccess.in
scripts/mysql_install_db.sh
1.65 06/04/12 16:35:10 jimw@stripped +0 -1
Remove stray blank line
scripts/mysql_convert_table_format.in
1.8 06/04/12 16:35:00 jimw@stripped +0 -0
Rename: scripts/mysql_convert_table_format.sh -> scripts/mysql_convert_table_format.in
scripts/mysqld_multi.in
1.30 06/04/12 16:34:45 jimw@stripped +0 -0
Rename: scripts/mysqld_multi.sh -> scripts/mysqld_multi.in
scripts/mysqldumpslow.in
1.9 06/04/12 16:34:36 jimw@stripped +0 -0
Rename: scripts/mysqldumpslow.sh -> scripts/mysqldumpslow.in
scripts/mysql_find_rows.in
1.8 06/04/12 16:34:30 jimw@stripped +0 -0
Rename: scripts/mysql_find_rows.sh -> scripts/mysql_find_rows.in
scripts/mysql_explain_log.in
1.4 06/04/12 16:34:22 jimw@stripped +0 -0
Rename: scripts/mysql_explain_log.sh -> scripts/mysql_explain_log.in
scripts/mysql_fix_extensions.in
1.4 06/04/12 16:34:17 jimw@stripped +0 -0
Rename: scripts/mysql_fix_extensions.sh -> scripts/mysql_fix_extensions.in
scripts/mysql_setpermission.in
1.5 06/04/12 16:34:04 jimw@stripped +0 -0
Rename: scripts/mysql_setpermission.sh -> scripts/mysql_setpermission.in
scripts/mysqlhotcopy.in
1.52 06/04/12 16:33:52 jimw@stripped +0 -0
Rename: scripts/mysqlhotcopy.sh -> scripts/mysqlhotcopy.in
scripts/mysql_zap.in
1.8 06/04/12 16:33:43 jimw@stripped +0 -0
Rename: scripts/mysql_zap.sh -> scripts/mysql_zap.in
scripts/fill_func_tables.in
1.6 06/04/12 16:33:02 jimw@stripped +0 -0
Rename: scripts/fill_func_tables.sh -> scripts/fill_func_tables.in
support-files/MacOSX/Makefile.am
1.10 06/04/12 16:32:02 jimw@stripped +5 -5
Rename non-sh files to use .in
support-files/MacOSX/StartupParameters.plist.in
1.2 06/04/12 16:31:21 jimw@stripped +0 -0
Rename: support-files/MacOSX/StartupParameters.plist.sh -> support-files/MacOSX/StartupParameters.plist.in
support-files/MacOSX/Description.plist.in
1.3 06/04/12 16:31:07 jimw@stripped +0 -0
Rename: support-files/MacOSX/Description.plist.sh -> support-files/MacOSX/Description.plist.in
support-files/MacOSX/Info.plist.in
1.4 06/04/12 16:31:03 jimw@stripped +0 -0
Rename: support-files/MacOSX/Info.plist.sh -> support-files/MacOSX/Info.plist.in
BitKeeper/etc/ignore
1.237 06/04/12 16:27:57 jimw@stripped +1 -0
added support-files/mysql-multi.server
support-files/Makefile.am
1.33 06/04/12 16:27:28 jimw@stripped +3 -1
Generate mysql-multi.server
BitKeeper/deleted/.del-mysqld_multi.server.sh~b6a9c9126ca50258
1.3 06/04/12 16:26:01 jimw@stripped +0 -0
Delete: support-files/mysqld_multi.server.sh
support-files/Makefile.am
1.32 06/04/12 16:24:17 jimw@stripped +11 -11
Deal with non-sh files being renamed to .in instead of .sh
support-files/MySQL-shared-compat.spec.in
1.8 06/04/12 16:22:36 jimw@stripped +0 -0
Rename: support-files/MySQL-shared-compat.spec.sh -> support-files/MySQL-shared-compat.spec.in
support-files/mysql.spec.in
1.137 06/04/12 16:22:21 jimw@stripped +0 -0
Rename: support-files/mysql.spec.sh -> support-files/mysql.spec.in
support-files/mysql-log-rotate.in
1.4 06/04/12 16:22:06 jimw@stripped +0 -0
Rename: support-files/mysql-log-rotate.sh -> support-files/mysql-log-rotate.in
support-files/ndb-config-2-node.ini.in
1.3 06/04/12 16:21:27 jimw@stripped +0 -0
Rename: support-files/ndb-config-2-node.ini.sh -> support-files/ndb-config-2-node.ini.in
support-files/my-small.cnf.in
1.21 06/04/12 16:21:26 jimw@stripped +0 -0
Rename: support-files/my-small.cnf.sh -> support-files/my-small.cnf.in
support-files/my-medium.cnf.in
1.24 06/04/12 16:21:26 jimw@stripped +0 -0
Rename: support-files/my-medium.cnf.sh -> support-files/my-medium.cnf.in
support-files/my-large.cnf.in
1.25 06/04/12 16:21:26 jimw@stripped +0 -0
Rename: support-files/my-large.cnf.sh -> support-files/my-large.cnf.in
support-files/my-innodb-heavy-4G.cnf.in
1.10 06/04/12 16:21:25 jimw@stripped +0 -0
Rename: support-files/my-innodb-heavy-4G.cnf.sh -> support-files/my-innodb-heavy-4G.cnf.in
support-files/my-huge.cnf.in
1.25 06/04/12 16:21:25 jimw@stripped +0 -0
Rename: support-files/my-huge.cnf.sh -> support-files/my-huge.cnf.in
# 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: jimw
# Host: rama.(none)
# Root: /home/jimw/my/mysql-5.1-refactor
--- 1.53/scripts/Makefile.am 2006-04-12 04:52:13 -07:00
+++ 1.54/scripts/Makefile.am 2006-04-12 16:38:57 -07:00
@@ -44,19 +44,19 @@
msql2mysql.sh \
mysql_config.sh \
mysql_fix_privilege_tables.sh \
- mysql_fix_extensions.sh \
+ mysql_fix_extensions.in \
mysql_install_db.sh \
- mysql_setpermission.sh \
+ mysql_setpermission.in \
mysql_secure_installation.sh \
- mysql_zap.sh \
- mysqlaccess.sh \
+ mysql_zap.in \
+ mysqlaccess.in \
mysqlbug.sh \
- mysql_convert_table_format.sh \
- mysql_find_rows.sh \
- mysqlhotcopy.sh \
- mysqldumpslow.sh \
- mysql_explain_log.sh \
- mysqld_multi.sh \
+ mysql_convert_table_format.in \
+ mysql_find_rows.in \
+ mysqlhotcopy.in \
+ mysqldumpslow.in \
+ mysql_explain_log.in \
+ mysqld_multi.in \
mysqld_safe.sh \
mysql_create_system_tables.sh
@@ -94,9 +94,9 @@
# We want the right version and configure comand line in mysqlbug
mysqlbug: ${top_builddir}/config.status mysqlbug.sh
-SUFFIXES = .sh
+SUFFIXES = .sh .in
-.sh:
+.sh .in:
@RM@ -f $@ $@-t
@SED@ \
-e 's!@''bindir''@!$(bindir)!g' \
--- 1.64/scripts/mysql_install_db.sh 2006-04-02 18:51:09 -07:00
+++ 1.65/scripts/mysql_install_db.sh 2006-04-12 16:35:10 -07:00
@@ -1,4 +1,3 @@
-
#!/bin/sh
# Copyright (C) 2002-2003 MySQL AB
# For a more info consult the file COPYRIGHT distributed with this file.
--- 1.31/support-files/Makefile.am 2005-11-03 16:41:33 -08:00
+++ 1.33/support-files/Makefile.am 2006-04-12 16:27:28 -07:00
@@ -17,18 +17,19 @@
## Process this file with automake to create Makefile.in
-EXTRA_DIST = mysql.spec.sh \
- my-small.cnf.sh \
- my-medium.cnf.sh \
- my-large.cnf.sh \
- my-huge.cnf.sh \
- my-innodb-heavy-4G.cnf.sh \
- mysql-log-rotate.sh \
+EXTRA_DIST = mysql.spec.in \
+ my-small.cnf.in \
+ my-medium.cnf.in \
+ my-large.cnf.in \
+ my-huge.cnf.in \
+ my-innodb-heavy-4G.cnf.in \
+ mysql-log-rotate.in \
mysql.server.sh \
+ mysql-multi.server.sh \
binary-configure.sh \
magic \
- MySQL-shared-compat.spec.sh \
- ndb-config-2-node.ini.sh
+ MySQL-shared-compat.spec.in \
+ ndb-config-2-node.ini.in
SUBDIRS = MacOSX
@@ -41,7 +42,7 @@
binary-configure \
ndb-config-2-node.ini
-pkgdata_SCRIPTS = mysql.server
+pkgdata_SCRIPTS = mysql.server mysql-multi.server
noinst_DATA = mysql-@VERSION@.spec \
MySQL-shared-compat.spec
@@ -55,6 +56,7 @@
mysql-@VERSION@.spec \
mysql-log-rotate \
mysql.server \
+ mysql-multi.server \
binary-configure \
MySQL-shared-compat.spec \
ndb-config-2-node.ini
@@ -63,9 +65,9 @@
rm -f $@
cp mysql.spec $@
-SUFFIXES = .sh
+SUFFIXES = .sh .in
-.sh:
+.sh .in:
@RM@ -f $@ $@-t
@SED@ \
-e 's!@''bindir''@!$(bindir)!g' \
--- 1.5/scripts/fill_func_tables.sh 2006-02-12 13:26:23 -08:00
+++ 1.7/scripts/fill_func_tables.in 2006-04-12 16:39:07 -07:00
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
# fill_func_tables - parse ../Docs/manual.texi
# Original version by vva
--- 1.29/scripts/mysqld_multi.sh 2006-01-13 11:59:35 -08:00
+++ 1.31/scripts/mysqld_multi.in 2006-04-12 16:42:10 -07:00
@@ -695,19 +695,19 @@
# 7.A Start-up Manage Script for $my_progname
#
# In the recent MySQL distributions you can find a file called
-# mysqld_multi.server.sh. It is a wrapper for $my_progname. This can
-# be used to start and stop multiple servers during boot and shutdown.
+# mysql-multi.server. It is a wrapper for $my_progname. This can be used
+# to start and stop multiple servers during boot and shutdown.
#
-# You can place the file in /etc/init.d/mysqld_multi.server.sh and
-# make the needed symbolic links to it from various run levels
-# (as per Linux/Unix standard). You may even replace the
-# /etc/init.d/mysql.server script with it.
+# You can place the file in /etc/init.d/mysql_multi.server and make the
+# needed symbolic links to it from various run levels (as per Linux/Unix
+# standard). You may even replace the /etc/init.d/mysql.server script with
+# it.
#
# Before using, you must create a my.cnf file either in /etc/my.cnf
# or /root/.my.cnf and add the [mysqld_multi] and [mysqld#] groups.
#
-# The script can be found from support-files/mysqld_multi.server.sh
-# in MySQL distribution. (Verify the script before using)
+# The script can be found from support-files/mysql-multi.server in MySQL
+# distribution. (Verify the script before using)
#
[mysqld_multi]
--- 1.9/support-files/MacOSX/Makefile.am 2005-08-15 06:44:52 -07:00
+++ 1.10/support-files/MacOSX/Makefile.am 2006-04-12 16:32:02 -07:00
@@ -17,9 +17,9 @@
## Process this file with automake to create Makefile.in
-EXTRA_DIST = Info.plist.sh \
- Description.plist.sh \
- StartupParameters.plist.sh \
+EXTRA_DIST = Info.plist.in \
+ Description.plist.in \
+ StartupParameters.plist.in \
postflight.sh \
preflight.sh \
ReadMe.txt \
@@ -40,9 +40,9 @@
postflight \
preflight
-SUFFIXES = .sh
+SUFFIXES = .sh .in
-.sh:
+.sh .in:
@RM@ -f $@ $@-t
@SED@ \
-e 's!@''prefix''@!$(prefix)!g' \
--- 1.236/BitKeeper/etc/ignore 2006-04-11 18:53:52 -07:00
+++ 1.237/BitKeeper/etc/ignore 2006-04-12 16:27:57 -07:00
@@ -1760,3 +1760,4 @@
zlib/*.vcproj
mysql-test/r/*.log
client/mysql_upgrade
+support-files/mysql-multi.server
| Thread |
|---|
| • bk commit into 5.1 tree (jimw:1.2338) | Jim Winstead | 13 Apr |
