diff options
author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-05-13 23:59:35 +0300 |
---|---|---|
committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-05-13 23:59:35 +0300 |
commit | b88e359c961b4e2b7c00627ee866533c2b07161d (patch) | |
tree | 11acbf7230c1c2c49b35c827d041a71cd1f2e512 /dev-db/mysql/files | |
parent | 2ccc9f182ace325dd4bcbf7f549e010a77900dfe (diff) |
deleted: dev-db/mysql/files/my.cnf
deleted: dev-db/mysql/files/my.cnf-4.0
deleted: dev-db/mysql/files/my.cnf-4.1
deleted: dev-db/mysql/files/my.cnf-5.1
deleted: dev-db/mysql/files/mysql-5.1-gcc45-apicheck.patch
deleted: dev-db/mysql/files/mysql.init
deleted: dev-db/mysql/mysql-5.1.46-r1.ebuild
Diffstat (limited to 'dev-db/mysql/files')
-rw-r--r-- | dev-db/mysql/files/my.cnf | 48 | ||||
-rw-r--r-- | dev-db/mysql/files/my.cnf-4.0 | 113 | ||||
-rw-r--r-- | dev-db/mysql/files/my.cnf-4.1 | 147 | ||||
-rw-r--r-- | dev-db/mysql/files/my.cnf-5.1 | 146 | ||||
-rw-r--r-- | dev-db/mysql/files/mysql-5.1-gcc45-apicheck.patch | 28 | ||||
-rwxr-xr-x | dev-db/mysql/files/mysql.init | 37 |
6 files changed, 0 insertions, 519 deletions
diff --git a/dev-db/mysql/files/my.cnf b/dev-db/mysql/files/my.cnf deleted file mode 100644 index 4e7d0f6..0000000 --- a/dev-db/mysql/files/my.cnf +++ /dev/null @@ -1,48 +0,0 @@ -# /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf,v 1.5 2008/11/14 01:49:37 robbat2 Exp $ -# -# This file can be simultaneously placed in three places: -# 1. /etc/mysql/my.cnf to set global options. -# 2. /var/lib/mysql/my.cnf to set server-specific options. -# 3. ~/.my.cnf to set user-specific options. -# -# One can use all long options that the program supports. -# Run the program with --help to get a list of them. -# -# The following values assume you have at least 32M RAM! - -[client] -#password = my_password -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -[safe_mysqld] -err-log = /var/log/mysql/mysql.err - -[mysqld] -#skip-networking -skip-innodb -innodb_file_per_table -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -port = 3306 -log = /var/log/mysql/mysql.log -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -language = /usr/share/mysql/english -skip-locking -set-variable = key_buffer=16M -set-variable = max_allowed_packet=1M -set-variable = thread_stack=128K - -[mysqldump] -quick -set-variable = max_allowed_packet=1M - -[mysql] -#no-auto-rehash # faster start of mysql but no tab completition - -[isamchk] -set-variable = key_buffer=16M diff --git a/dev-db/mysql/files/my.cnf-4.0 b/dev-db/mysql/files/my.cnf-4.0 deleted file mode 100644 index 305f7c9..0000000 --- a/dev-db/mysql/files/my.cnf-4.0 +++ /dev/null @@ -1,113 +0,0 @@ -# /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0,v 1.2 2008/11/14 02:16:25 robbat2 Exp $ -# -# This file can be simultaneously placed in three places: -# 1. /etc/mysql/my.cnf to set global options. -# 2. /var/lib/mysql/my.cnf to set server-specific options. -# 3. ~/.my.cnf to set user-specific options. -# -# One can use all long options that the program supports. -# Run the program with --help to get a list of them. -# -# The following values assume you have at least 64M RAM! - -[client] -#password = my_password -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -[safe_mysqld] -err-log = /var/log/mysql/mysql.err - -[mysqld] -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -log-error = /var/log/mysql/mysqld.err -# If set, mysql logs all queries (general query log). This will be deprecated in -# MySQL 5.0. This logs all queries, even error queries and is slow. -# log = /var/log/mysql/mysql.log -# -# If you really need logging, you'd rather use binary logging. Especially when doing -# replication. Read file:/usr/share/doc/mysql-*/manual.html.gz#Replication for info. -# You can use PURGE MASTER LOGS TO '$hostname-bin.010' to get rid of old logs -# from $hostname-bin.01 up to $hostname-bin.09 while the slave server is -# running. -# Before doing that, check which logfile slave curently uses by running -# mysql> SHOW SLAVE STATUS -# To list logfiles on master do: -# mysql> SHOW MASTER LOGS -# Then use PURGE for those not needed anymore only! Never remove the files -# manually! -# -# Also consult RESET MASTER and RESET SLAVE commands before doing any changes -# mysql> RESET MASTER - Deletes all binary logs listed in the index -# file, resetting the binlog index file to be empty. -# mysql> RESET SLAVE - Makes the slave forget its replication position in -# the master logs. -# mysql> SET SQL_LOG_BIN=0 - this turns off logging (execute on MASTER only) -# mysql> SET SQL_LOG_BIN=1 - this turns on logging (execute on MASTER only) -# -# log-bin -# set-variable = binlog-do-db=non_existant -# set-variable = binlog-ignore-db=database_name -# -# server-id has to unique for each master or slave in your network, -# lets use the last number from IP address -# server-id = 207 -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -language = /usr/share/mysql/english -skip-locking -set-variable = key_buffer=16M -set-variable = max_allowed_packet=1M -set-variable = thread_stack=128K -# be secure by default! -bind-address = 127.0.0.1 -port = 3306 -# this can make it even more secure: -#skip-networking -# -# the following is the InnoDB configuration -# if you wish to disable innodb instead -# uncomment just the next line -#skip-innodb -# -# the rest of the innodb config follows: -# don't eat too much memory, we're trying to be safe on 64Mb boxes -# you might want to bump this up a bit on boxes with more RAM -set-variable = innodb_buffer_pool_size=32M -# this is the default, increase it if you have lots of tables -set-variable = innodb_additional_mem_pool_size=1M -# -# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( -# and upstream wants things to be under /var/lib/mysql/, so that's the route -# we have to take for the moment -innodb_data_home_dir = /var/lib/mysql/ -innodb_log_arch_dir = /var/lib/mysql/ -innodb_log_group_home_dir = /var/lib/mysql/ -# you may wish to change this size to be more suitable for your system -# the max is there to avoid run-away growth on your machine -innodb_data_file_path = ibdata1:10M:autoextend:max:128M -# we keep this at around 25% of of innodb_buffer_pool_size -# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) -set-variable = innodb_log_file_size=8M -# this is the default, increase it if you have very large transactions going on -set-variable = innodb_log_buffer_size=1M -# this is the default and won't hurt you -# you shouldn't need to tweak it -set-variable = innodb_log_files_in_group=2 -# see the innodb config docs, the other options are not always safe -innodb_flush_log_at_trx_commit = 1 -innodb_file_per_table - -[mysqldump] -quick -set-variable = max_allowed_packet=16M - -[mysql] -#no-auto-rehash # faster start of mysql but no tab completion - -[isamchk] -set-variable = key_buffer=16M diff --git a/dev-db/mysql/files/my.cnf-4.1 b/dev-db/mysql/files/my.cnf-4.1 deleted file mode 100644 index 458a58a..0000000 --- a/dev-db/mysql/files/my.cnf-4.1 +++ /dev/null @@ -1,147 +0,0 @@ -# /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1,v 1.4 2008/11/14 02:16:25 robbat2 Exp $ - -# The following options will be passed to all MySQL clients -[client] -#password = your_password -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -[mysql] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqladmin] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlcheck] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqldump] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlimport] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlshow] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[myisamchk] -character-sets-dir=/usr/share/mysql/charsets - -[myisampack] -character-sets-dir=/usr/share/mysql/charsets - -# use [safe_mysqld] with mysql-3 -[mysqld_safe] -err-log = /var/log/mysql/mysql.err - -# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations -[mysqld] -character-set-server = utf8 -default-character-set = utf8 -user = mysql -port = 3306 -socket = /var/run/mysqld/mysqld.sock -pid-file = /var/run/mysqld/mysqld.pid -log-error = /var/log/mysql/mysqld.err -basedir = /usr -datadir = @DATADIR@ -skip-locking -key_buffer = 16M -max_allowed_packet = 1M -table_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M -language = /usr/share/mysql/english - -# security: -# using "localhost" in connects uses sockets by default -# skip-networking -bind-address = 127.0.0.1 - -log-bin -server-id = 1 - -# point the following paths to different dedicated disks -tmpdir = /tmp/ -#log-update = /path-to-dedicated-directory/hostname - -# you need the debug USE flag enabled to use the following directives, -# if needed, uncomment them, start the server and issue -# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace -# this will show you *exactly* what's happening in your server ;) - -#log = /tmp/mysqld.sql -#gdb -#debug = d:t:i:o,/tmp/mysqld.trace -#one-thread - -# uncomment the following directives if you are using BDB tables -#bdb_cache_size = 4M -#bdb_max_lock = 10000 - -# the following is the InnoDB configuration -# if you wish to disable innodb instead -# uncomment just the next line -#skip-innodb -# -# the rest of the innodb config follows: -# don't eat too much memory, we're trying to be safe on 64Mb boxes -# you might want to bump this up a bit on boxes with more RAM -innodb_buffer_pool_size = 16M -# this is the default, increase it if you have lots of tables -innodb_additional_mem_pool_size = 2M -# -# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( -# and upstream wants things to be under /var/lib/mysql/, so that's the route -# we have to take for the moment -#innodb_data_home_dir = /var/lib/mysql/ -#innodb_log_arch_dir = /var/lib/mysql/ -#innodb_log_group_home_dir = /var/lib/mysql/ -# you may wish to change this size to be more suitable for your system -# the max is there to avoid run-away growth on your machine -innodb_data_file_path = ibdata1:10M:autoextend:max:128M -# we keep this at around 25% of of innodb_buffer_pool_size -# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) -innodb_log_file_size = 5M -# this is the default, increase it if you have very large transactions going on -innodb_log_buffer_size = 8M -# this is the default and won't hurt you -# you shouldn't need to tweak it -set-variable = innodb_log_files_in_group=2 -# see the innodb config docs, the other options are not always safe -innodb_flush_log_at_trx_commit = 1 -innodb_lock_wait_timeout = 50 -innodb_file_per_table - -[mysqldump] -quick -max_allowed_packet = 16M - -[mysql] -# uncomment the next directive if you are not familiar with SQL -#safe-updates - -[isamchk] -key_buffer = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[myisamchk] -key_buffer = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout diff --git a/dev-db/mysql/files/my.cnf-5.1 b/dev-db/mysql/files/my.cnf-5.1 deleted file mode 100644 index 5a7e096..0000000 --- a/dev-db/mysql/files/my.cnf-5.1 +++ /dev/null @@ -1,146 +0,0 @@ -# /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.2 2010/03/24 18:26:09 robbat2 Exp $ - -# The following options will be passed to all MySQL clients -[client] -#password = your_password -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -[mysql] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqladmin] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlcheck] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqldump] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlimport] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[mysqlshow] -character-sets-dir=/usr/share/mysql/charsets -default-character-set=utf8 - -[myisamchk] -character-sets-dir=/usr/share/mysql/charsets - -[myisampack] -character-sets-dir=/usr/share/mysql/charsets - -# use [safe_mysqld] with mysql-3 -[mysqld_safe] -err-log = /var/log/mysql/mysql.err - -# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations -[mysqld] -character-set-server = utf8 -user = mysql -port = 3306 -socket = /var/run/mysqld/mysqld.sock -pid-file = /var/run/mysqld/mysqld.pid -log-error = /var/log/mysql/mysqld.err -basedir = /usr -datadir = @DATADIR@ -skip-external-locking -key_buffer = 16M -max_allowed_packet = 1M -table_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M -language = /usr/share/mysql/english - -# security: -# using "localhost" in connects uses sockets by default -# skip-networking -bind-address = 127.0.0.1 - -log-bin -server-id = 1 - -# point the following paths to different dedicated disks -tmpdir = /tmp/ -#log-update = /path-to-dedicated-directory/hostname - -# you need the debug USE flag enabled to use the following directives, -# if needed, uncomment them, start the server and issue -# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace -# this will show you *exactly* what's happening in your server ;) - -#log = /tmp/mysqld.sql -#gdb -#debug = d:t:i:o,/tmp/mysqld.trace -#one-thread - -# uncomment the following directives if you are using BDB tables -#bdb_cache_size = 4M -#bdb_max_lock = 10000 - -# the following is the InnoDB configuration -# if you wish to disable innodb instead -# uncomment just the next line -#skip-innodb -# -# the rest of the innodb config follows: -# don't eat too much memory, we're trying to be safe on 64Mb boxes -# you might want to bump this up a bit on boxes with more RAM -innodb_buffer_pool_size = 16M -# this is the default, increase it if you have lots of tables -innodb_additional_mem_pool_size = 2M -# -# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( -# and upstream wants things to be under /var/lib/mysql/, so that's the route -# we have to take for the moment -#innodb_data_home_dir = /var/lib/mysql/ -#innodb_log_arch_dir = /var/lib/mysql/ -#innodb_log_group_home_dir = /var/lib/mysql/ -# you may wish to change this size to be more suitable for your system -# the max is there to avoid run-away growth on your machine -innodb_data_file_path = ibdata1:10M:autoextend:max:128M -# we keep this at around 25% of of innodb_buffer_pool_size -# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) -innodb_log_file_size = 5M -# this is the default, increase it if you have very large transactions going on -innodb_log_buffer_size = 8M -# this is the default and won't hurt you -# you shouldn't need to tweak it -innodb_log_files_in_group=2 -# see the innodb config docs, the other options are not always safe -innodb_flush_log_at_trx_commit = 1 -innodb_lock_wait_timeout = 50 -innodb_file_per_table - -[mysqldump] -quick -max_allowed_packet = 16M - -[mysql] -# uncomment the next directive if you are not familiar with SQL -#safe-updates - -[isamchk] -key_buffer = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[myisamchk] -key_buffer = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout diff --git a/dev-db/mysql/files/mysql-5.1-gcc45-apicheck.patch b/dev-db/mysql/files/mysql-5.1-gcc45-apicheck.patch deleted file mode 100644 index 46125c7..0000000 --- a/dev-db/mysql/files/mysql-5.1-gcc45-apicheck.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- mysql-5.1.45/Makefile.am.orig 2010-03-31 10:52:25.000000000 -0400 -+++ mysql-5.1.45/Makefile.am 2010-03-31 10:55:05.000000000 -0400 -@@ -312,24 +312,7 @@ - $(MAKE) abi_headers="$^" do_abi_check - - do_abi_check: -- set -ex; \ -- for file in $(abi_headers); do \ -- @CC@ -E -nostdinc -dI \ -- -I$(top_srcdir)/include \ -- -I$(top_srcdir)/include/mysql \ -- -I$(top_srcdir)/sql \ -- -I$(top_builddir)/include \ -- -I$(top_builddir)/include/mysql \ -- -I$(top_builddir)/sql \ -- $$file 2>/dev/null | \ -- @SED@ -e '/^# /d' \ -- -e '/^[ ]*$$/d' \ -- -e '/^#pragma GCC set_debug_pwd/d' \ -- -e '/^#ident/d' > \ -- $(top_builddir)/abi_check.out; \ -- @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \ -- @RM@ $(top_builddir)/abi_check.out; \ -- done -+ echo "Skipping do_abi_check" - - # Don't update the files from bitkeeper - %::SCCS/s.% diff --git a/dev-db/mysql/files/mysql.init b/dev-db/mysql/files/mysql.init deleted file mode 100755 index 16ea7bc..0000000 --- a/dev-db/mysql/files/mysql.init +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.7 2004/07/14 21:41:15 agriffis Exp $ - -depend() { - need net - use dns -} - -checkconfig() { - if [ ! -f /etc/mysql/my.cnf ] ; then - eerror "No /etc/mysql/my.cnf file exists!" - fi - - dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"` - - if [ ! -d $dir/mysql ] ; then - eerror "You dont appear to have the mysql database installed yet." - eerror "Please run /usr/bin/mysql_install_db to have this done..." - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting mysqld" - /usr/bin/safe_mysqld >/dev/null 2>&1 & - eend $? -} - -stop () { - ebegin "Stopping mysqld" - start-stop-daemon --stop --quiet \ - --pidfile=/var/run/mysqld/mysqld.pid --retry 20 - eend $? -} |