From 8f659d05a2d4641b437973be577a6b1427920729 Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Thu, 13 Oct 2005 11:05:59 -0700
Subject: Fix typo (thread_cache should be thread_cache_size) in example
 configuration files. (Bug #13811)

---
 support-files/my-huge.cnf.sh            | 2 +-
 support-files/my-innodb-heavy-4G.cnf.sh | 2 +-
 support-files/my-large.cnf.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'support-files')

diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
index d25686f1c21..06683994a72 100644
--- a/support-files/my-huge.cnf.sh
+++ b/support-files/my-huge.cnf.sh
@@ -33,7 +33,7 @@ sort_buffer_size = 2M
 read_buffer_size = 2M
 read_rnd_buffer_size = 8M
 myisam_sort_buffer_size = 64M
-thread_cache = 8
+thread_cache_size = 8
 query_cache_size = 32M
 # Try number of CPU's*2 for thread_concurrency
 thread_concurrency = 8
diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh
index 062d106ce6a..4204e172016 100644
--- a/support-files/my-innodb-heavy-4G.cnf.sh
+++ b/support-files/my-innodb-heavy-4G.cnf.sh
@@ -128,7 +128,7 @@ join_buffer_size = 8M
 # the amount of thread creations needed if you have a lot of new
 # connections. (Normally this doesn't give a notable performance
 # improvement if you have a good thread implementation.)
-thread_cache = 8
+thread_cache_size = 8
 
 # This permits the application to give the threads system a hint for the
 # desired number of threads that should be run at the same time.  This
diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
index 59aca4b32f2..85151eb1077 100644
--- a/support-files/my-large.cnf.sh
+++ b/support-files/my-large.cnf.sh
@@ -33,7 +33,7 @@ sort_buffer_size = 1M
 read_buffer_size = 1M
 read_rnd_buffer_size = 4M
 myisam_sort_buffer_size = 64M
-thread_cache = 8
+thread_cache_size = 8
 query_cache_size= 16M
 # Try number of CPU's*2 for thread_concurrency
 thread_concurrency = 8
-- 
cgit v1.2.1


From a315d1be766565347331374736de4e9954734992 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Thu, 13 Oct 2005 22:01:02 +0200
Subject: RPM spec file fixes:

 - added a usermod call to assign a potential existing mysql user to the
   correct user group (BUG#12823)
 - Save the perror binary built during Max build so it supports the NDB
   error codes (BUG#13740)
 - added a separate macro "mysqld_group" to be able to define the
   user group of the mysql user seperately, if desired.
---
 support-files/mysql.spec.sh | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

(limited to 'support-files')

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 0f597e1dda5..7247bfbaf3e 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -10,6 +10,7 @@
 %endif
 %define license GPL
 %define mysqld_user		mysql
+%define mysqld_group	mysql
 %define server_suffix -standard
 %define mysqldatadir /var/lib/mysql
 
@@ -313,6 +314,8 @@ make test-force || true
 # Save mysqld-max
 mv sql/mysqld sql/mysqld-max
 nm --numeric-sort sql/mysqld-max > sql/mysqld-max.sym
+# Save the perror binary so it supports the NDB error codes (BUG#13740)
+mv extra/perror extra/perror.ndb
 
 # Install the ndb binaries
 (cd ndb; make install DESTDIR=$RBR)
@@ -321,7 +324,7 @@ nm --numeric-sort sql/mysqld-max > sql/mysqld-max.sym
 install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/
 
 # Include libgcc.a in the devel subpackage (BUG 4921)
-if [ "$CC" = gcc ]
+if expr "$CC" : ".*gcc.*" > /dev/null ;
 then
   libgcc=`$CC --print-libgcc-file`
   if [ -f $libgcc ]
@@ -384,6 +387,9 @@ make install-strip DESTDIR=$RBR benchdir_root=%{_datadir}
 # install saved mysqld-max
 install -s -m755 $MBD/sql/mysqld-max $RBR%{_sbindir}/mysqld-max
 
+# install saved perror binary with NDB support (BUG#13740)
+install -s -m755 $MBD/extra/perror.ndb $RBR%{_bindir}/perror
+
 # install symbol files ( for stack trace resolution)
 install -m644 $MBD/sql/mysqld-max.sym $RBR%{_libdir}/mysql/mysqld-max.sym
 install -m644 $MBD/sql/mysqld.sym $RBR%{_libdir}/mysql/mysqld.sym
@@ -439,18 +445,20 @@ fi
 
 # Create a MySQL user and group. Do not report any problems if it already
 # exists.
-groupadd -r %{mysqld_user} 2> /dev/null || true
-useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" -g %{mysqld_user} %{mysqld_user} 2> /dev/null || true 
+groupadd -r %{mysqld_group} 2> /dev/null || true
+useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true 
+# The user may already exist, make sure it has the proper group nevertheless (BUG#12823)
+usermod -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true
 
 # Change permissions so that the user that will run the MySQL daemon
 # owns all database files.
-chown -R %{mysqld_user}:%{mysqld_user} $mysql_datadir
+chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
 
 # Initiate databases
 %{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
 
 # Change permissions again to fix any new files.
-chown -R %{mysqld_user}:%{mysqld_user} $mysql_datadir
+chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
 
 # Fix permissions for the permission database so that only the user
 # can read them.
@@ -668,6 +676,15 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Thu Oct 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- added a usermod call to assign a potential existing mysql user to the
+  correct user group (BUG#12823)
+- Save the perror binary built during Max build so it supports the NDB
+  error codes (BUG#13740)
+- added a separate macro "mysqld_group" to be able to define the
+  user group of the mysql user seperately, if desired.
+
 * Thu Sep 29 2005 Lenz Grimmer <lenz@mysql.com>
 
 - fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
-- 
cgit v1.2.1


From c93927eef02715da9cb3d2be87f769f6667bc78e Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Thu, 13 Oct 2005 22:10:54 +0200
Subject:  - added a usermod call in the postinstall section of the RPM spec
 file    to assign a potential existing mysql user to the correct user group
 (BUG#12823)

---
 support-files/mysql.spec.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'support-files')

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 6104b7a4882..16845aa4be7 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -2,6 +2,7 @@
 %define release			0
 %define license GPL
 %define mysqld_user		mysql
+%define mysqld_group	mysql
 %define server_suffix -standard
 %define mysqldatadir /var/lib/mysql
 
@@ -371,18 +372,20 @@ fi
 
 # Create a MySQL user and group. Do not report any problems if it already
 # exists.
-groupadd -r %{mysqld_user} 2> /dev/null || true
-useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" -g %{mysqld_user} %{mysqld_user} 2> /dev/null || true 
+groupadd -r %{mysqld_group} 2> /dev/null || true
+useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true 
+# The user may already exist, make sure it has the proper group nevertheless (BUG#12823)
+usermod -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true
 
 # Change permissions so that the user that will run the MySQL daemon
 # owns all database files.
-chown -R %{mysqld_user}:%{mysqld_user} $mysql_datadir
+chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
 
 # Initiate databases
 %{_bindir}/mysql_install_db -IN-RPM --user=%{mysqld_user}
 
 # Change permissions again to fix any new files.
-chown -R %{mysqld_user}:%{mysqld_user} $mysql_datadir
+chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
 
 # Fix permissions for the permission database so that only the user
 # can read them.
@@ -562,6 +565,10 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Thu Oct 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- added a usermod call to assign a potential existing mysql user to the
+  correct user group (BUG#12823)
 * Thu Sep 29 2005 Lenz Grimmer <lenz@mysql.com>
 
 - fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
-- 
cgit v1.2.1


From 5035abf052af06fc1f55cad00e7e106c74022c62 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com" <>
Date: Fri, 14 Oct 2005 22:11:52 +0200
Subject: mysql.spec.sh:   Removed unneeded/obsolte configure options   Added
 archive engine to standard server   Removed the embedded server from
 experimental server   Changed suffix "-Max" => "-max"   Changed comment
 string "Max" => "Experimental"

---
 support-files/mysql.spec.sh | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'support-files')

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 588e367a080..6e71ec198bc 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -252,8 +252,6 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
 	    --with-readline ;
 	    # Add this for more debugging support
 	    # --with-debug
-	    # Add this for MyISAM RAID support:
-	    # --with-raid
 	    "
 
  # benchdir does not fit in above model. Maybe a separate bench distribution
@@ -296,7 +294,6 @@ then
 fi
 
 BuildMySQL "--enable-shared \
-		--without-openssl \
 		--with-berkeley-db \
 		--with-innodb \
 		--with-ndbcluster \
@@ -305,9 +302,8 @@ BuildMySQL "--enable-shared \
 		--with-example-storage-engine \
 		--with-blackhole-storage-engine \
 		--with-federated-storage-engine \
-		--with-embedded-server \
-		--with-comment=\"MySQL Community Edition - Max (GPL)\" \
-		--with-server-suffix='-Max'"
+		--with-comment=\"MySQL Community Edition - Experimental (GPL)\" \
+		--with-server-suffix='-max'"
 
 make test-force || true
 
@@ -356,11 +352,8 @@ BuildMySQL "--disable-shared \
 %endif
 		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
 		--with-server-suffix='%{server_suffix}' \
-		--without-embedded-server \
-		--without-berkeley-db \
-		--with-innodb \
-		--without-vio \
-		--without-openssl"
+		--with-archive-storage-engine \
+		--with-innodb"
 nm --numeric-sort sql/mysqld > sql/mysqld.sym
 
 make test-force || true
-- 
cgit v1.2.1


From 4ea2aacb2a45c0e20d2d56f2baab67fd70ffa19f Mon Sep 17 00:00:00 2001
From: "kent@mysql.com" <>
Date: Fri, 14 Oct 2005 22:49:53 +0200
Subject: mysql.spec.sh:   For 5.x, always compile with --with-big-tables  
 Copy the config.log file to location outside   the build tree

---
 support-files/mysql.spec.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'support-files')

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 6e71ec198bc..2c28b5921c3 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -249,7 +249,7 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
             --includedir=%{_includedir} \
             --mandir=%{_mandir} \
 	    --enable-thread-safe-client \
-	    --with-readline ;
+	    --with-readline ; \
 	    # Add this for more debugging support
 	    # --with-debug
 	    "
@@ -302,9 +302,16 @@ BuildMySQL "--enable-shared \
 		--with-example-storage-engine \
 		--with-blackhole-storage-engine \
 		--with-federated-storage-engine \
+	        --with-big-tables \
 		--with-comment=\"MySQL Community Edition - Experimental (GPL)\" \
 		--with-server-suffix='-max'"
 
+# We might want to save the config log file
+if test -n "$MYSQL_MAXCONFLOG_DEST"
+then
+  cp -fp config.log "$MYSQL_MAXCONFLOG_DEST"
+fi
+
 make test-force || true
 
 # Save mysqld-max
@@ -353,9 +360,16 @@ BuildMySQL "--disable-shared \
 		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
 		--with-server-suffix='%{server_suffix}' \
 		--with-archive-storage-engine \
-		--with-innodb"
+		--with-innodb \
+		--with-big-tables"
 nm --numeric-sort sql/mysqld > sql/mysqld.sym
 
+# We might want to save the config log file
+if test -n "$MYSQL_CONFLOG_DEST"
+then
+  cp -fp config.log "$MYSQL_CONFLOG_DEST"
+fi
+
 make test-force || true
 
 %install
-- 
cgit v1.2.1


From dcd4b9923a6807eb4822363bf39c4798f4e9ec2b Mon Sep 17 00:00:00 2001
From: "kent@mysql.com" <>
Date: Sat, 15 Oct 2005 01:40:28 +0200
Subject: mysql.spec.sh:   Give mode arguments the same way in all places  
 Moved copy of mysqld.a to "standard" build, but   disabled it as we don't do
 embedded yet in 5.0

---
 support-files/mysql.spec.sh | 46 +++++++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 12 deletions(-)

(limited to 'support-files')

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 2c28b5921c3..d4d0b4e810b 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -323,9 +323,6 @@ mv extra/perror extra/perror.ndb
 # Install the ndb binaries
 (cd ndb; make install DESTDIR=$RBR)
 
-# Install embedded server library in the build root
-install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/
-
 # Include libgcc.a in the devel subpackage (BUG 4921)
 if expr "$CC" : ".*gcc.*" > /dev/null ;
 then
@@ -393,18 +390,22 @@ make install-strip DESTDIR=$RBR benchdir_root=%{_datadir}
 (cd $RBR%{_libdir}; tar xf $RBR/shared-libs.tar; rm -f $RBR/shared-libs.tar)
 
 # install saved mysqld-max
-install -s -m755 $MBD/sql/mysqld-max $RBR%{_sbindir}/mysqld-max
+install -s -m 755 $MBD/sql/mysqld-max $RBR%{_sbindir}/mysqld-max
 
 # install saved perror binary with NDB support (BUG#13740)
-install -s -m755 $MBD/extra/perror.ndb $RBR%{_bindir}/perror
+install -s -m 755 $MBD/extra/perror.ndb $RBR%{_bindir}/perror
 
 # install symbol files ( for stack trace resolution)
-install -m644 $MBD/sql/mysqld-max.sym $RBR%{_libdir}/mysql/mysqld-max.sym
-install -m644 $MBD/sql/mysqld.sym $RBR%{_libdir}/mysql/mysqld.sym
+install -m 644 $MBD/sql/mysqld-max.sym $RBR%{_libdir}/mysql/mysqld-max.sym
+install -m 644 $MBD/sql/mysqld.sym $RBR%{_libdir}/mysql/mysqld.sym
 
 # Install logrotate and autostart
-install -m644 $MBD/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
-install -m755 $MBD/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
+install -m 644 $MBD/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
+install -m 755 $MBD/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
+
+# Install embedded server library in the build root
+# FIXME No libmysqld on 5.0 yet
+#install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/
 
 # Create a symlink "rcmysql", pointing to the init.script. SuSE users
 # will appreciate that, as all services usually offer this.
@@ -438,7 +439,7 @@ fi
 mysql_datadir=%{mysqldatadir}
 
 # Create data directory if needed
-if test ! -d $mysql_datadir; then mkdir -m755 $mysql_datadir; fi
+if test ! -d $mysql_datadir; then mkdir -m 755 $mysql_datadir; fi
 if test ! -d $mysql_datadir/mysql; then mkdir $mysql_datadir/mysql; fi
 if test ! -d $mysql_datadir/test; then mkdir $mysql_datadir/test; fi
 
@@ -485,7 +486,7 @@ sleep 2
 mysql_clusterdir=/var/lib/mysql-cluster
 
 # Create cluster directory if needed
-if test ! -d $mysql_clusterdir; then mkdir -m755 $mysql_clusterdir; fi
+if test ! -d $mysql_clusterdir; then mkdir -m 755 $mysql_clusterdir; fi
 
 
 %post Max
@@ -677,12 +678,33 @@ fi
 
 %files embedded
 %defattr(-, root, root, 0755)
-%attr(644, root, root) %{_libdir}/mysql/libmysqld.a
+# %attr(644, root, root) %{_libdir}/mysql/libmysqld.a
 
 # The spec file changelog only includes changes made to the spec file
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+
+* Sat Oct 15 2005 Kent Boortz <kent@mysql.com>
+
+- Give mode arguments the same way in all places
+- Moved copy of mysqld.a to "standard" build, but
+  disabled it as we don't do embedded yet in 5.0
+
+* Fri Oct 14 2005 Kent Boortz <kent@mysql.com>
+
+- For 5.x, always compile with --with-big-tables
+- Copy the config.log file to location outside
+  the build tree
+
+* Fri Oct 14 2005 Kent Boortz <kent@mysql.com>
+
+- Removed unneeded/obsolte configure options
+- Added archive engine to standard server
+- Removed the embedded server from experimental server
+- Changed suffix "-Max" => "-max"
+- Changed comment string "Max" => "Experimental"
+
 * Thu Oct 13 2005 Lenz Grimmer <lenz@mysql.com>
 
 - added a usermod call to assign a potential existing mysql user to the
-- 
cgit v1.2.1


From 8bccfab21ff654ec0593ca17adbae636b3b83b46 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com" <>
Date: Wed, 19 Oct 2005 02:53:03 +0200
Subject: mysql.spec.sh:   Enabled yaSSL mysql-test-run.pl:   Increased test
 case timeout from 15 min

---
 support-files/mysql.spec.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'support-files')

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index d4d0b4e810b..65d74474386 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -239,6 +239,7 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
             --with-unix-socket-path=/var/lib/mysql/mysql.sock \
             --prefix=/ \
 	    --with-extra-charsets=complex \
+	    --with-yassl \
             --exec-prefix=%{_exec_prefix} \
             --libexecdir=%{_sbindir} \
             --libdir=%{_libdir} \
@@ -684,6 +685,9 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
+
+- Enabled yaSSL support
 
 * Sat Oct 15 2005 Kent Boortz <kent@mysql.com>
 
-- 
cgit v1.2.1


From e3c4993bf3f6c42cdccb650df79300b55600c683 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com" <>
Date: Wed, 19 Oct 2005 22:00:12 +0200
Subject: mysql.spec.sh:   Made yaSSL support an option (off by default)

---
 support-files/mysql.spec.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'support-files')

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 65d74474386..265f576cd86 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -1,8 +1,15 @@
 %define mysql_version		@VERSION@
+
 # use "rpmbuild --with static" or "rpm --define '_with_static 1'" (for RPM 3.x)
 # to enable static linking (off by default)
 %{?_with_static:%define STATIC_BUILD 1}
 %{!?_with_static:%define STATIC_BUILD 0}
+
+# use "rpmbuild --with yassl" or "rpm --define '_with_yassl 1'" (for RPM 3.x)
+# to build with yaSSL support (off by default)
+%{?_with_yassl:%define YASSL_BUILD 1}
+%{!?_with_yassl:%define YASSL_BUILD 0}
+
 %if %{STATIC_BUILD}
 %define release 0
 %else
@@ -239,7 +246,9 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
             --with-unix-socket-path=/var/lib/mysql/mysql.sock \
             --prefix=/ \
 	    --with-extra-charsets=complex \
+%if %{YASSL_BUILD}
 	    --with-yassl \
+%endif
             --exec-prefix=%{_exec_prefix} \
             --libexecdir=%{_sbindir} \
             --libdir=%{_libdir} \
@@ -687,6 +696,10 @@ fi
 %changelog 
 * Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
 
+- Made yaSSL support an option (off by default)
+
+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
+
 - Enabled yaSSL support
 
 * Sat Oct 15 2005 Kent Boortz <kent@mysql.com>
-- 
cgit v1.2.1


From f793d7b5bf4b8ba314d6588a0764818599e8dc58 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Thu, 27 Oct 2005 14:51:58 +0200
Subject:  - Removed obsolete and outdated man page files from the man   
 directory - these files are now maintained in the mysqldoc    repository and
 included in the source distribution during the    release build. Updated the
 configure.in script and Makefiles to    create the man page file list at
 build time  - Updated the file list in the RPM spec file to include all
 currently    available man pages (this can not be done with wildcards, as   
 the man pages are spread across several subpackages. However, RPM    warns
 about unpackaged files, so newly added man pages can be    spotted)

---
 support-files/mysql.spec.sh | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

(limited to 'support-files')

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 16845aa4be7..3384e074ba9 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -440,41 +440,48 @@ fi
 
 %doc %attr(644, root, man) %{_mandir}/man1/isamchk.1*
 %doc %attr(644, root, man) %{_mandir}/man1/isamlog.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
+%doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
+%doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1*
+%doc %attr(644, root, man) %{_mandir}/man1/myisampack.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
+%doc %attr(644, root, man) %{_mandir}/man1/pack_isam.1*
 %doc %attr(644, root, man) %{_mandir}/man1/perror.1*
 %doc %attr(644, root, man) %{_mandir}/man1/replace.1*
+%doc %attr(644, root, man) %{_mandir}/man1/safe_mysqld.1*
 
 %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
 
 %attr(755, root, root) %{_bindir}/isamchk
 %attr(755, root, root) %{_bindir}/isamlog
-%attr(755, root, root) %{_bindir}/my_print_defaults
 %attr(755, root, root) %{_bindir}/myisamchk
 %attr(755, root, root) %{_bindir}/myisam_ftdump
 %attr(755, root, root) %{_bindir}/myisamlog
 %attr(755, root, root) %{_bindir}/myisampack
+%attr(755, root, root) %{_bindir}/my_print_defaults
+%attr(755, root, root) %{_bindir}/mysqlbug
 %attr(755, root, root) %{_bindir}/mysql_convert_table_format
+%attr(755, root, root) %{_bindir}/mysqld_multi
+%attr(755, root, root) %{_bindir}/mysqld_safe
 %attr(755, root, root) %{_bindir}/mysql_explain_log
 %attr(755, root, root) %{_bindir}/mysql_fix_extensions
 %attr(755, root, root) %{_bindir}/mysql_fix_privilege_tables
+%attr(755, root, root) %{_bindir}/mysqlhotcopy
 %attr(755, root, root) %{_bindir}/mysql_install_db
 %attr(755, root, root) %{_bindir}/mysql_secure_installation
 %attr(755, root, root) %{_bindir}/mysql_setpermission
-%attr(755, root, root) %{_bindir}/mysql_zap
-%attr(755, root, root) %{_bindir}/mysqlbug
-%attr(755, root, root) %{_bindir}/mysqld_multi
-%attr(755, root, root) %{_bindir}/mysqld_safe
-%attr(755, root, root) %{_bindir}/mysqlhotcopy
 %attr(755, root, root) %{_bindir}/mysqltest
+%attr(755, root, root) %{_bindir}/mysql_zap
 %attr(755, root, root) %{_bindir}/pack_isam
 %attr(755, root, root) %{_bindir}/perror
 %attr(755, root, root) %{_bindir}/replace
-%attr(755, root, root) %{_bindir}/resolve_stack_dump
 %attr(755, root, root) %{_bindir}/resolveip
+%attr(755, root, root) %{_bindir}/resolve_stack_dump
 %attr(755, root, root) %{_bindir}/safe_mysqld
 
 %attr(755, root, root) %{_sbindir}/mysqld
@@ -502,10 +509,14 @@ fi
 %attr(755, root, root) %{_bindir}/mysqlimport
 %attr(755, root, root) %{_bindir}/mysqlshow
 
+%doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlcheck.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqldump.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlimport.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlshow.1*
 
 %post shared
@@ -517,6 +528,7 @@ fi
 %files devel
 %defattr(-, root, root, 0755)
 %doc EXCEPTIONS-CLIENT
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
 %attr(755, root, root) %{_bindir}/comp_err
 %attr(755, root, root) %{_bindir}/mysql_config
 %dir %attr(755, root, root) %{_includedir}/mysql
@@ -565,6 +577,10 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Thu Oct 27 2005 Lenz Grimmer <lenz@grimmer.com>
+
+- added more man pages
+
 * Thu Oct 13 2005 Lenz Grimmer <lenz@mysql.com>
 
 - added a usermod call to assign a potential existing mysql user to the
-- 
cgit v1.2.1


From b3263c032e5179b4e3c4a942598e87a7428299c1 Mon Sep 17 00:00:00 2001
From: "mysqldev@mysql.com" <>
Date: Thu, 27 Oct 2005 18:32:14 +0200
Subject:  - cleanup: removed the empty NEW-RPMS directory and all references 
 - cleanup: removed obsolete support-files/MacOSX/make_mysql_pkg.pl    script
 (we now use Do-pkg for building OS X packages)

---
 support-files/MacOSX/make_mysql_pkg.pl | 475 ---------------------------------
 1 file changed, 475 deletions(-)
 delete mode 100644 support-files/MacOSX/make_mysql_pkg.pl

(limited to 'support-files')

diff --git a/support-files/MacOSX/make_mysql_pkg.pl b/support-files/MacOSX/make_mysql_pkg.pl
deleted file mode 100644
index 22283d57098..00000000000
--- a/support-files/MacOSX/make_mysql_pkg.pl
+++ /dev/null
@@ -1,475 +0,0 @@
-#!/usr/bin/perl -w
-#
-#
-# make_mysql_pkg.pl
-#
-# This script creates a Mac OS X installation package
-# of MySQL for Apple's Installer application.
-#
-# To use it:
-#
-# 1.) Unpack the mysql source tarball and cd into the directory
-# 2.) execute this script
-# 
-#
-# Written by Marc Liyanage (http://www.entropy.ch)
-#
-# History:
-#
-# When         Who              What
-# ------------------------------------------------------------------
-# 2001-09-16   Marc Liyanage    First version
-# 2001-11-18   Marc Liyanage    Improved configure directory options
-#
-
-use strict;
-use DirHandle;
-
-my $data = {};
-	
-$data->{PREFIX_DIR}     = "/usr/local/mysql";
-$data->{CONFIG}         = join(" ",
-	"--prefix=$data->{PREFIX_DIR}",
-	"--localstatedir=$data->{PREFIX_DIR}/data",
-	"--libdir=$data->{PREFIX_DIR}/lib",
-	"--includedir=$data->{PREFIX_DIR}/include",
-	"--with-named-z-libs=/usr/local/libz.a",
-	"--with-innodb",
-	"--with-server-suffix='-entropy.ch'",
-	"--with-comment='http://www.entropy.ch/software/macosx/mysql/'",
-	"--with-mysqld-user=mysql",
-	"--enable-assembler",
-	"CFLAGS=\"-DHAVE_BROKEN_REALPATH -lncurses\"",
-);
-
-
-
-
-
-prepare($data);
-configure_source($data);
-make($data);
-make_binary_distribution($data);
-create_pax_root($data);
-create_package($data);
-cleanup($data);
-
-print "Package $data->{PACKAGE_TARBALL_FILENAME} created\n";
-
-
-
-
-
-
-# Subroutines follow here...
-
-
-
-
-# Prepares data in the global $data hash, like version numbers,
-# directory names etc. Also makes sure that no old stuff
-# is in our way.
-# 
-sub prepare {
-
-	my ($data) = @_;
-	
-	# Keep the current wd for reference
-	#
-	$data->{OLDWD} = `pwd`;
-	chomp($data->{OLDWD});
-
-	# Look for configure script
-	#
-	unless (-f "configure") {
-		abort($data, "Unable to find 'configure', make sure you're in the MySQL source toplevel directory!");
-	}
-
-	# Try to find version number there
-	#
-	my $mysql_version_h = `cat configure`;
-	($data->{VERSION}) = $mysql_version_h =~ /^VERSION=(.+?)$/m;
-
-	unless ($data->{VERSION} =~ /\d+/) {
-		abort($data, "Unable to find MySQL version number!");
-	}
-
-	debug($data, "found MySQL version number $data->{VERSION}");
-	
-	
-	# PAXROOT_DIR is where we will build our own little
-	# fake /usr/local directory. Make sure it doesn't exist,
-	# then try to create it.
-	#
-	$data->{PAXROOT_DIR} = "/tmp/mysql-$data->{VERSION}-paxroot";
-
-	if (-e $data->{PAXROOT_DIR}) {
-		abort($data, "$data->{PAXROOT_DIR} exists, please remove first");
-	}
-
-	if (system("mkdir $data->{PAXROOT_DIR}")) {
-		abort($data, "Unable to mkdir $data->{PAXROOT_DIR}, please make sure you have the right permissions!");
-	}
-	
-
-	# PACKAGE_DIR is where we will build the package directory
-	# hierarchy, according to the standard .pkg layout.
-	#
-	$data->{PACKAGE_NAME} = "mysql-$data->{VERSION}.pkg";
-	$data->{PACKAGE_DIR} = "/tmp/$data->{PACKAGE_NAME}";
-
-	if (-e $data->{PACKAGE_DIR}) {
-		abort($data, "$data->{PACKAGE_DIR} exists, please remove first");
-	}
-
-	if (system("mkdir $data->{PACKAGE_DIR}")) {
-		abort($data, "Unable to mkdir $data->{PACKAGE_DIR}, please make sure you have the right permissions!");
-	}
-	
-	
-}
-
-
-
-# Configure the MySQL source with our options
-#
-sub configure_source {
-
-	my ($data) = @_;
-
-	if (system("./configure $data->{CONFIG}")) {
-		abort($data, "Unable to configure!");
-	}
-
-}
-
-
-
-
-# Build the software
-#
-sub make {
-
-	my ($data) = @_;
-
-	if (system("make")) {
-		abort($data, "Unable to make!");
-	}
-
-}
-
-
-
-# We don't ever install the software, but instead we use an
-# included script to create a binary distribution
-# tarball.
-#
-sub make_binary_distribution {
-
-	my ($data) = @_;
-
-	if (system("./scripts/make_binary_distribution > make_binary_distribution.out")) {
-		abort($data, "Unable to make_binary_distribution!");
-	}
-	
-	my @output = `cat make_binary_distribution.out`;
-	my $last_line = $output[-1];
-	unlink("make_binary_distribution.out");
-	
-	my ($tarball_filename, $tarball_directory) = $last_line =~ /^((.+)\.tar\.gz) created/i;
-
-	unless ($tarball_filename and -f $tarball_filename) {
-		abort($data, "Unable determine the output filename of scripts/make_binary_distribution!");
-	}
-	
-	$data->{BINARY_TARBALL_FILENAME} = $tarball_filename;
-	$data->{BINARY_TARBALL_DIRECTORY} = $tarball_directory;
-
-}
-
-
-
-
-# Now we build a fake /usr/local directory hierarchy.
-# This will be fed to the pax tool to create the archive.
-#
-sub create_pax_root {
-
-	my ($data) = @_;
-
-	# Go there and try to extract the binary distribution
-	# tarball which we created in the previous step.
-	#
-	chdir($data->{PAXROOT_DIR});
-	my $tarfile = "$data->{OLDWD}/$data->{BINARY_TARBALL_FILENAME}";
-	
-	if (system("tar -xzf $tarfile")) {
-		abort($data, "Unable to extract $tarfile inside $data->{PAXROOT_DIR}");
-	}
-	
-	# Rename it to what we want it to be in the
-	# installed /usr/local directory later on, i.e.
-	# mysql-<version>. Then create a symlink from
-	# mysql to mysql-<version>
-	#
-	rename($data->{BINARY_TARBALL_DIRECTORY}, "mysql-$data->{VERSION}");
-	symlink("mysql-$data->{VERSION}", "mysql");
-
-
-	# We create a bunch of symlinks in /usr/local/bin and
-	# /usr/local/share/man so that the end-user will not
-	# have to adjust PATH and MANPATH to include the
-	# /usr/local/mysql/bin and man directories.
-	#
-	system("mkdir -p $_") foreach qw(bin share/man);
-
-
-	# First create the symlinks in the bin directory
-	#
-	# 2001-02-13: we no longer use symlinks for the binaries, we
-	# use small dummy scripts instead because the
-	# mysql scripts do a lot of guesswork with their
-	# own path and that will not work when called via the symlink
-	#
-#	symlink("../mysql/bin/$_", "$_") foreach (grep {$_ !~ /^\.+$/} DirHandle->new("../mysql/bin")->read());
-
-	chdir("bin");
-
-	foreach my $command (grep {$_ !~ /^\.+$/} DirHandle->new("../mysql/bin")->read()) {
-		
-		my $scriptcode = qq+#!/bin/sh\n# Part of the entropy.ch mysql package\ncd /usr/local/mysql/\nexec ./bin/$command "\$\@"\n+;
-		open(SCRIPTFILE, ">$command") or die "Unable to write open $command\n";
-		print SCRIPTFILE $scriptcode;
-		close(SCRIPTFILE);
-		chmod(0755, $command);
-		
-	}
-
-
-
-
-
-
-
-	# Now include the man pages. Two problems here:
-	# 1.) the make_binary_distribution script does not seem
-	#     to include the man pages, so we have to copy them over
-	#     now. [outdated, was fixed by MySQL!]
-	# 2.) The man pages could be in different sections, so
-	#     we have to recursively copy *and* symlink them.
-	#
-
-	# First find out what's there in the source distribution.
-	# Store the names of the manpages in anonymous
-	# arrays which in turn will be stored in a hash, using
-	# the section numbers as hash keys.
-	#
-	chdir("$data->{PAXROOT_DIR}/mysql");
-	my %man_sections;
-	foreach my $manpage (grep {$_ =~ /^.+\.(\d+)$/} DirHandle->new("man")->read()) {
-
-		my ($section) = $manpage =~ /\.(\d+)$/;
-
-		$man_sections{$section} ||= [];
-		push @{$man_sections{$section}}, "$manpage";
-
-	}
-
-
-	# Now iterate through the sections and man pages,
-	# and copy/symlink the man pages
-	#
-	chdir("$data->{PAXROOT_DIR}/share/man/");
-
-	foreach my $section (keys(%man_sections)) {
-		
-		system("mkdir -p man$section");
-		chdir("man$section");
-		
-		foreach my $manpage (@{$man_sections{$section}}) {
-			
-			symlink("../../../mysql/man/$manpage", $manpage)
-						
-		}
-
-		chdir("..");
-		
-	}
-
-
-
-	# Fix up the library and lib directories. They are packed up wrong in the
-	# binary distribution tarball.
-	#
-	# (no longer needed as of 3.23.47)
-	# (oops, still needed because 3.23.47 is broken...)
-	#
-#	if (-d "$data->{PAXROOT_DIR}/mysql/lib/mysql") {
-#		abort($data, "$data->{PAXROOT_DIR}/mysql/lib/mysql exists, layout has changed!");
-#	}
-#	chdir("$data->{PAXROOT_DIR}/mysql/lib/");
-#	system("mkdir -p mysql");
-#	system("mv * mysql");
-
-#	if (-d "$data->{PAXROOT_DIR}/mysql/include/mysql") {
-#		abort($data, "$data->{PAXROOT_DIR}/mysql/include/mysql exists, layout has changed!");
-#	}
-#	chdir("$data->{PAXROOT_DIR}/mysql/include/");
-#	system("mkdir -p mysql");
-#	system("mv * mysql");
-
-
-
-
-
-
-
-
-
-}
-
-
-
-# Take the pax root directory, create a few auxiliary
-# files and then pack everything up into a tarball
-#
-sub create_package {
-
-	my ($data) = @_;
-
-	# Create the resources directory in which all
-	# interesting files for this package will be stored
-	#
-	$data->{PKG_RESOURCES_DIR} = "$data->{PACKAGE_DIR}/Contents/Resources";
-
-	if (system("mkdir -p $data->{PKG_RESOURCES_DIR}")) {
-		abort("Unable to create package resources dir $data->{PKG_RESOURCES_DIR}");
-	}
-
-
-	# Create the big archive with all the files using
-	# the pax tool
-	#
-	chdir($data->{PAXROOT_DIR});
-	if(system("pax -w . | gzip -c > $data->{PKG_RESOURCES_DIR}/mysql-$data->{VERSION}.pax.gz")) {
-		abort("Unable to create package pax file");
-	}
-
-
-	# Create the "Bill Of Materials" (bom) file.
-	#	
-	if(system("mkbom . $data->{PKG_RESOURCES_DIR}/mysql-$data->{VERSION}.bom")) {
-		abort("Unable to create package bom file");
-	}
-
-
-	# Create the ".sizes" file with some information about the package
-	#	
-	my $size_uncompressed = `du -sk $data->{PAXROOT_DIR} | cut -f 1`;
-	chomp($size_uncompressed);
-	
-	my $size_compressed = `du -sk $data->{PACKAGE_DIR} | cut -f 1`;
-	chomp($size_compressed);
-	
-	my $numfiles = `find /tmp/mysql-$data->{VERSION}-paxroot | wc -l`;
-	$numfiles--;
-	
-	open(SIZESFILE, ">$data->{PKG_RESOURCES_DIR}/mysql-$data->{VERSION}.sizes") or abort("Unable to write open sizes file $data->{PKG_RESOURCES_DIR}/mysql-$data->{VERSION}.sizes");
-	print SIZESFILE "NumFiles $numfiles\n";
-	print SIZESFILE "InstalledSize $size_uncompressed\n";
-	print SIZESFILE "CompressedSize $size_compressed\n";
-	close(SIZESFILE);
-
-
-	# Create the ".info" file with more information abou the package.
-	#
-	open(INFOFILE, ">$data->{PKG_RESOURCES_DIR}/mysql-$data->{VERSION}.info") or abort("Unable to write open sizes file $data->{PKG_RESOURCES_DIR}/mysql-$data->{VERSION}.info");
-	my $infodata = join("", <DATA>);
-	$infodata =~ s/<%(.+?)%>/$data->{$1}/eg;
-	abort("Unable to get info file data from __DATA__!") unless ($infodata =~ /\w+/);
-	print INFOFILE $infodata;
-	close(INFOFILE);
-
-
-
-	# Finally, create the .tar.gz file for the package, 
-	# this is our end result
-	#
-	chdir($data->{PACKAGE_DIR});
-	chdir("..");
-	
-	$data->{PACKAGE_TARBALL_FILENAME} = "$data->{PACKAGE_NAME}.tar.gz";
-
-	if(system("tar -czf $data->{OLDWD}/$data->{PACKAGE_TARBALL_FILENAME} $data->{PACKAGE_NAME}")) {
-		abort("Unable to create package tar file $data->{OLDWD}/$data->{PACKAGE_TARBALL_FILENAME}");
-	}
-
-	
-	
-}
-
-
-# Abort with an error message
-#
-sub abort {
-
-	my ($data, $errormessage) = @_;
-	
-	my ($caller) = (caller(1))[3];
-	$caller =~ s/^main:://;
-	
-	print "*** Error: $caller(): $errormessage\n";
-	
-	exit 1;
-
-}
-
-
-# Output informative messages
-#
-sub debug {
-
-	my ($data, $message) = @_;
-	
-	my ($caller) = (caller(1))[3];
-	$caller =~ s/^main:://;
-	
-	print "*** Info: $caller(): $message\n";
-
-}
-
-
-
-# Remove temporary items
-#
-sub cleanup {
-
-	my ($data) = @_;
-	
-	chdir($data->{OLDWD});
-	
-	system("rm -rf $data->{PACKAGE_DIR}");
-	system("rm -rf $data->{PAXROOT_DIR}");
-	system("rm $data->{BINARY_TARBALL_FILENAME}");
-
-}
-
-
-
-
-__DATA__
-Title MySQL
-Version <%VERSION%>
-Description The MySQL database server in a convenient Mac OS X package. Some additional configuration is necessary, please see http://www.entropy.ch/software/macosx/mysql/
-DefaultLocation /usr/local
-Diskname (null)
-DeleteWarning
-NeedsAuthorization YES
-DisableStop NO
-UseUserMask NO
-Application NO
-Relocatable NO
-Required NO
-InstallOnly NO
-RequiresReboot NO
-InstallFat NO
-- 
cgit v1.2.1


From 0f3192323c4de51205b17cf0e8ea71f773d38517 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Fri, 28 Oct 2005 10:46:07 +0200
Subject:  - fixed RPM spec file list after merge, removed dupes

---
 support-files/mysql.spec.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'support-files')

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 384f7ab29fa..5cd9d1646a4 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -548,9 +548,9 @@ fi
 %attr(755, root, root) %{_bindir}/my_print_defaults
 %attr(755, root, root) %{_bindir}/mysqlbug
 %attr(755, root, root) %{_bindir}/mysql_convert_table_format
+%attr(755, root, root) %{_bindir}/mysql_create_system_tables
 %attr(755, root, root) %{_bindir}/mysqld_multi
 %attr(755, root, root) %{_bindir}/mysqld_safe
-%attr(755, root, root) %{_bindir}/mysql_create_system_tables
 %attr(755, root, root) %{_bindir}/mysql_explain_log
 %attr(755, root, root) %{_bindir}/mysql_fix_extensions
 %attr(755, root, root) %{_bindir}/mysql_fix_privilege_tables
@@ -558,13 +558,8 @@ fi
 %attr(755, root, root) %{_bindir}/mysql_install_db
 %attr(755, root, root) %{_bindir}/mysql_secure_installation
 %attr(755, root, root) %{_bindir}/mysql_setpermission
-%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql
-%attr(755, root, root) %{_bindir}/mysql_zap
-%attr(755, root, root) %{_bindir}/mysqlbug
-%attr(755, root, root) %{_bindir}/mysqld_multi
-%attr(755, root, root) %{_bindir}/mysqld_safe
-%attr(755, root, root) %{_bindir}/mysqlhotcopy
 %attr(755, root, root) %{_bindir}/mysqltest
+%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql
 %attr(755, root, root) %{_bindir}/mysql_zap
 %attr(755, root, root) %{_bindir}/pack_isam
 %attr(755, root, root) %{_bindir}/perror
-- 
cgit v1.2.1


From 303ba3704415cd095a01974c499772d5a270053e Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Fri, 28 Oct 2005 13:31:19 +0200
Subject:  - added man page for the mysqlmanager in the RPM spec file list

---
 support-files/mysql.spec.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'support-files')

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 45efd2dd3a2..a10e525ee50 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -549,6 +549,7 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlmanager.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
 %doc %attr(644, root, man) %{_mandir}/man1/pack_isam.1*
-- 
cgit v1.2.1


From 7decf21c0204f93ade305bd46ecb2c7f31e5cd93 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Fri, 28 Oct 2005 16:50:52 +0200
Subject: - after merge fix: removed pack_isam from the RPM spec file list
 again

---
 support-files/mysql.spec.sh | 2 --
 1 file changed, 2 deletions(-)

(limited to 'support-files')

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index a10e525ee50..1b74ce50328 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -552,7 +552,6 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlmanager.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
-%doc %attr(644, root, man) %{_mandir}/man1/pack_isam.1*
 %doc %attr(644, root, man) %{_mandir}/man1/perror.1*
 %doc %attr(644, root, man) %{_mandir}/man1/replace.1*
 %doc %attr(644, root, man) %{_mandir}/man1/safe_mysqld.1*
@@ -580,7 +579,6 @@ fi
 %attr(755, root, root) %{_bindir}/mysqltest
 %attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql
 %attr(755, root, root) %{_bindir}/mysql_zap
-%attr(755, root, root) %{_bindir}/pack_isam
 %attr(755, root, root) %{_bindir}/perror
 %attr(755, root, root) %{_bindir}/replace
 %attr(755, root, root) %{_bindir}/resolveip
-- 
cgit v1.2.1