diff options
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/my-huge.cnf.sh | 28 | ||||
| -rw-r--r-- | support-files/my-large.cnf.sh | 28 | ||||
| -rw-r--r-- | support-files/my-medium.cnf.sh | 28 | ||||
| -rw-r--r-- | support-files/my-small.cnf.sh | 28 | ||||
| -rw-r--r-- | support-files/mysql-max.spec.sh | 14 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 37 |
6 files changed, 93 insertions, 70 deletions
diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index 9baee043b15..7917ab9d9f1 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -47,20 +47,20 @@ server-id = 1 #set-variable = bdb_max_lock=100000 # Uncomment the following if you are using Innobase tables -#innobase_data_home_dir = @localstatedir@/ -#innobase_log_group_home_dir = @localstatedir@/ -#innobase_log_arch_dir = @localstatedir@/ -#innobase_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M -#set-variable = innobase_mirrored_log_groups=1 -#set-variable = innobase_log_files_in_group=3 -#set-variable = innobase_log_file_size=5M -#set-variable = innobase_log_buffer_size=8M -#innobase_flush_log_at_trx_commit=1 -#innobase_log_archive=0 -#set-variable = innobase_buffer_pool_size=16M -#set-variable = innobase_additional_mem_pool_size=2M -#set-variable = innobase_file_io_threads=4 -#set-variable = innobase_lock_wait_timeout=50 +#innodb_data_home_dir = @localstatedir@/ +#innodb_log_group_home_dir = @localstatedir@/ +#innodb_log_arch_dir = @localstatedir@/ +#innodb_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M +#set-variable = innodb_mirrored_log_groups=1 +#set-variable = innodb_log_files_in_group=3 +#set-variable = innodb_log_file_size=5M +#set-variable = innodb_log_buffer_size=8M +#innodb_flush_log_at_trx_commit=1 +#innodb_log_archive=0 +#set-variable = innodb_buffer_pool_size=16M +#set-variable = innodb_additional_mem_pool_size=2M +#set-variable = innodb_file_io_threads=4 +#set-variable = innodb_lock_wait_timeout=50 [mysqldump] quick diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh index e02e07d2a09..d4e28c14019 100644 --- a/support-files/my-large.cnf.sh +++ b/support-files/my-large.cnf.sh @@ -43,20 +43,20 @@ server-id = 1 #set-variable = bdb_max_lock=100000 # Uncomment the following if you are using Innobase tables -#innobase_data_home_dir = @localstatedir@/ -#innobase_log_group_home_dir = @localstatedir@/ -#innobase_log_arch_dir = @localstatedir@/ -#innobase_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M -#set-variable = innobase_mirrored_log_groups=1 -#set-variable = innobase_log_files_in_group=3 -#set-variable = innobase_log_file_size=5M -#set-variable = innobase_log_buffer_size=8M -#innobase_flush_log_at_trx_commit=1 -#innobase_log_archive=0 -#set-variable = innobase_buffer_pool_size=16M -#set-variable = innobase_additional_mem_pool_size=2M -#set-variable = innobase_file_io_threads=4 -#set-variable = innobase_lock_wait_timeout=50 +#innodb_data_home_dir = @localstatedir@/ +#innodb_log_group_home_dir = @localstatedir@/ +#innodb_log_arch_dir = @localstatedir@/ +#innodb_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M +#set-variable = innodb_mirrored_log_groups=1 +#set-variable = innodb_log_files_in_group=3 +#set-variable = innodb_log_file_size=5M +#set-variable = innodb_log_buffer_size=8M +#innodb_flush_log_at_trx_commit=1 +#innodb_log_archive=0 +#set-variable = innodb_buffer_pool_size=16M +#set-variable = innodb_additional_mem_pool_size=2M +#set-variable = innodb_file_io_threads=4 +#set-variable = innodb_lock_wait_timeout=50 # Point the following paths to different dedicated disks #tmpdir = /tmp/ diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh index 4f5cdc135d2..d25345502e2 100644 --- a/support-files/my-medium.cnf.sh +++ b/support-files/my-medium.cnf.sh @@ -45,20 +45,20 @@ server-id = 1 #set-variable = bdb_max_lock=10000 # Uncomment the following if you are using Innobase tables -#innobase_data_home_dir = @localstatedir@/ -#innobase_log_group_home_dir = @localstatedir@/ -#innobase_log_arch_dir = @localstatedir@/ -#innobase_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M -#set-variable = innobase_mirrored_log_groups=1 -#set-variable = innobase_log_files_in_group=3 -#set-variable = innobase_log_file_size=5M -#set-variable = innobase_log_buffer_size=8M -#innobase_flush_log_at_trx_commit=1 -#innobase_log_archive=0 -#set-variable = innobase_buffer_pool_size=16M -#set-variable = innobase_additional_mem_pool_size=2M -#set-variable = innobase_file_io_threads=4 -#set-variable = innobase_lock_wait_timeout=50 +#innodb_data_home_dir = @localstatedir@/ +#innodb_log_group_home_dir = @localstatedir@/ +#innodb_log_arch_dir = @localstatedir@/ +#innodb_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M +#set-variable = innodb_mirrored_log_groups=1 +#set-variable = innodb_log_files_in_group=3 +#set-variable = innodb_log_file_size=5M +#set-variable = innodb_log_buffer_size=8M +#innodb_flush_log_at_trx_commit=1 +#innodb_log_archive=0 +#set-variable = innodb_buffer_pool_size=16M +#set-variable = innodb_additional_mem_pool_size=2M +#set-variable = innodb_file_io_threads=4 +#set-variable = innodb_lock_wait_timeout=50 [mysqldump] quick diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh index 6472d10155f..6cafa8281fe 100644 --- a/support-files/my-small.cnf.sh +++ b/support-files/my-small.cnf.sh @@ -42,20 +42,20 @@ server-id = 1 #skip-bdb # Uncomment the following if you are using Innobase tables -#innobase_data_home_dir = @localstatedir@/ -#innobase_log_group_home_dir = @localstatedir@/ -#innobase_log_arch_dir = @localstatedir@/ -#innobase_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M -#set-variable = innobase_mirrored_log_groups=1 -#set-variable = innobase_log_files_in_group=3 -#set-variable = innobase_log_file_size=5M -#set-variable = innobase_log_buffer_size=8M -#innobase_flush_log_at_trx_commit=1 -#innobase_log_archive=0 -#set-variable = innobase_buffer_pool_size=16M -#set-variable = innobase_additional_mem_pool_size=2M -#set-variable = innobase_file_io_threads=4 -#set-variable = innobase_lock_wait_timeout=50 +#innodb_data_home_dir = @localstatedir@/ +#innodb_log_group_home_dir = @localstatedir@/ +#innodb_log_arch_dir = @localstatedir@/ +#innodb_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M +#set-variable = innodb_mirrored_log_groups=1 +#set-variable = innodb_log_files_in_group=3 +#set-variable = innodb_log_file_size=5M +#set-variable = innodb_log_buffer_size=8M +#innodb_flush_log_at_trx_commit=1 +#innodb_log_archive=0 +#set-variable = innodb_buffer_pool_size=16M +#set-variable = innodb_additional_mem_pool_size=2M +#set-variable = innodb_file_io_threads=4 +#set-variable = innodb_lock_wait_timeout=50 [mysqldump] quick diff --git a/support-files/mysql-max.spec.sh b/support-files/mysql-max.spec.sh index 7e6f9eac480..49f131154c0 100644 --- a/support-files/mysql-max.spec.sh +++ b/support-files/mysql-max.spec.sh @@ -22,7 +22,7 @@ Obsoletes: mysql # Think about what you use here since the first step is to # run a rm -rf -BuildRoot: /var/tmp/mysql +BuildRoot: /var/tmp/mysql-max # From the manual %description @@ -72,7 +72,7 @@ para maiores informações. %prep %setup -n mysql-max-%{mysql_version} -# %setup -T -D -a 1 -n mysql-%{mysql_version} +# %setup -T -D -a 1 -n mysql-max-%{mysql_version} %build # The all-static flag is to make the RPM work on different @@ -105,7 +105,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \ --includedir=/usr/include \ --mandir=/usr/man \ --with-berkeley-db \ - --with-innobase \ + --with-innodb \ --with-comment=\"Official MySQL-Max RPM\"; # Add this for more debugging support # --with-debug @@ -118,7 +118,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \ # Use the build root for temporary storage of the shared libraries. RBR=$RPM_BUILD_ROOT -MBD=$RPM_BUILD_DIR/mysql-%{mysql_version} +MBD=$RPM_BUILD_DIR/mysql-max-%{mysql_version} if test -z "$RBR" -o "$RBR" = "/" then echo "RPM_BUILD_ROOT has stupid value" @@ -140,7 +140,7 @@ BuildMySQL "--disable-shared" \ %install -n mysql-max-%{mysql_version} RBR=$RPM_BUILD_ROOT -MBD=$RPM_BUILD_DIR/mysql-%{mysql_version} +MBD=$RPM_BUILD_DIR/mysql-max-%{mysql_version} # Ensure that needed directories exists install -d $RBR/etc/{logrotate.d,rc.d/init.d} install -d $RBR/var/lib/mysql/mysql @@ -157,7 +157,7 @@ install -m644 $MBD/support-files/mysql-log-rotate $RBR/etc/logrotate.d/mysql install -m755 $MBD/support-files/mysql.server $RBR/etc/rc.d/init.d/mysql # Install docs -install -m644 $RPM_BUILD_DIR/mysql-%{mysql_version}/Docs/mysql.info \ +install -m644 $RPM_BUILD_DIR/mysql-max-%{mysql_version}/Docs/mysql.info \ $RBR/usr/info/mysql.info for file in README COPYING COPYING.LIB Docs/manual_toc.html Docs/manual.html \ Docs/manual.txt Docs/manual.texi Docs/manual.ps \ @@ -259,5 +259,5 @@ fi %changelog -* 2000-04-01 Monty +* Fri Apr 13 2001 Monty First version of mysql-max.spec.sh based on mysql.spec.sh diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index f973d638520..3fd602dd818 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -127,6 +127,17 @@ Group: Applications/Databases This package contains the shared libraries (*.so*) which certain languages and applications need to dynamically load and use MySQL. +%package Max +Release: %{release} +Summary: MySQL - server with Berkeley DB and Innodb support +Group: Applications/Databases +Obsoletes: mysql-Max + +%description Max +Extra MySQL server binary to get support extra features like +transactional tables. To active these features on only have to install +this package after the server package. + %prep %setup -n mysql-%{mysql_version} @@ -160,8 +171,6 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \ --infodir=/usr/info \ --includedir=/usr/include \ --mandir=/usr/man \ - --without-berkeley-db \ - --without-innobase \ --with-comment=\"Official MySQL RPM\"; # Add this for more debugging support # --with-debug @@ -185,12 +194,15 @@ fi rm -rf $RBR mkdir -p $RBR -BuildMySQL "--enable-shared --enable-thread-safe-client --without-server" +# Build the shared libraries and mysqld-max + +BuildMySQL "--enable-shared --enable-thread-safe-client --with-berkeley-db --with-innodb --with-mysqld-ldflags='-all-static' --with-server-suffix='-Max'" -# Save everything for debus -tar cf $RBR/all.tar . +# Save everything for debug +# tar cf $RBR/all.tar . -# Save shared libraries +# Save shared libraries and mysqld-max +mv sql/mysqld sql/mysqld-max (cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*) (cd libmysql_r/.libs; tar rf $RBR/shared-libs.tar *.so*) @@ -201,7 +213,8 @@ mv Docs/manual.ps.save Docs/manual.ps BuildMySQL "--disable-shared" \ "--with-mysqld-ldflags='-all-static'" \ - "--with-client-ldflags='-all-static'" + "--with-client-ldflags='-all-static'" \ + "--without-berkeley-db --without-innodb" %install -n mysql-%{mysql_version} RBR=$RPM_BUILD_ROOT @@ -220,6 +233,9 @@ make install DESTDIR=$RBR benchdir_root=/usr/share/ # Install shared libraries (Disable for architectures that don't support it) (cd $RBR/usr/lib; tar xf $RBR/shared-libs.tar) +# install saved mysqld-max +install -m755 $MBD/sql/mysqld-max $RBR/usr/sbin/mysqld-max + # Install logrotate and autostart install -m644 $MBD/support-files/mysql-log-rotate $RBR/etc/logrotate.d/mysql install -m755 $MBD/support-files/mysql.server $RBR/etc/rc.d/init.d/mysql @@ -370,8 +386,15 @@ fi %attr(-, root, root) /usr/share/sql-bench %attr(-, root, root) /usr/share/mysql-test +%files Max +%attr(755, root, root) /usr/sbin/mysqld-max + %changelog +* Fri Apr 13 2001 Monty + +- Added mysqld-max to the distribution + * Tue Jan 2 2001 Monty - Added mysql-test to the bench package |