Sprout from master 2005-10-20 15:04:08 UTC Elan Ruusamäe <glen@pld-linux.org> '- enable archive-storage-engine; rel 2'
Cherrypick from master 2005-11-07 17:30:44 UTC Elan Ruusamäe <glen@pld-linux.org> '- add skip-slave-start and bind-address directives':
mysqld.conf -> 1.21
Delete:
mysql-build.patch
mysql-client.conf
mysql-docs_make.patch
mysql-fulltext-small.patch
mysql-info-res.patch
mysql-libs.patch
mysql-moreincludes.patch
mysql-no-my_inet_ntoa.patch
mysql-no_libnsl.patch
mysql-opt.patch
mysql.monitrc
mysql.sysconfig
+++ /dev/null
-diff -urNbB mysql-5.0.13-rc.org/sql/mysqld.cc mysql-5.0.13-rc/sql/mysqld.cc
---- mysql-5.0.13-rc.org/sql/mysqld.cc 2005-09-22 21:39:56.000000000 +0200
-+++ mysql-5.0.13-rc/sql/mysqld.cc 2005-09-29 19:29:59.991454000 +0200
-@@ -3183,7 +3183,7 @@
- init_ssl();
-
- #ifdef HAVE_LIBWRAP
-- libwrapName= my_progname+dirname_length(my_progname);
-+ libwrapName= (char *)my_progname+dirname_length(my_progname);
- openlog(libwrapName, LOG_PID, LOG_AUTH);
- #endif
-
+++ /dev/null
-#[client]
-#default-character-set=latin2
-
+++ /dev/null
-diff -Naur mysql-3.23.25-beta/Docs/Makefile.am mysql-3.23.25-beta-p/Docs/Makefile.am
---- mysql-3.23.25-beta/Docs/Makefile.am Wed Sep 27 10:51:44 2000
-+++ mysql-3.23.25-beta-p/Docs/Makefile.am Thu Oct 12 21:40:23 2000
-@@ -18,7 +18,7 @@
- Support/generate-mirror-listing.pl
- info_TEXINFOS = manual.texi
-
--targets = manual.txt mysql.info manual.html manual.pdf
-+targets = mysql.info manual.html
-
- BUILT_SOURCES = $(targets) manual_toc.html include.texi
- EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt INSTALL-BINARY
---- mysql-3.23.25-beta/Docs/Makefile.in Wed Sep 27 11:02:20 2000
-+++ mysql-3.23.25-beta-p/Docs/Makefile.in Thu Oct 12 22:03:10 2000
-@@ -168,7 +168,7 @@
-
- info_TEXINFOS = manual.texi
-
--targets = manual.txt mysql.info manual.html manual.pdf
-+targets = manual.txt mysql.info manual.html
-
- BUILT_SOURCES = $(targets) manual_toc.html include.texi
- EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt INSTALL-BINARY
+++ /dev/null
---- myisam/ftdefs.h Fri Jan 10 23:39:49 2003
-+++ myisam/ftdefs.h.tjbnym Fri Jan 10 23:39:39 2003
-@@ -22,7 +22,7 @@
- #include <m_ctype.h>
- #include <my_tree.h>
-
--#define MIN_WORD_LEN 4
-+#define MIN_WORD_LEN 3
-
- #define HYPHEN_IS_DELIM
- #define HYPHEN_IS_CONCAT /* not used for now */
+++ /dev/null
---- mysql-3.23.54a/Docs/manual.texi.orig Mon Dec 16 12:40:58 2002
-+++ mysql-3.23.54a/Docs/manual.texi Mon Dec 16 15:04:14 2002
-@@ -29177,7 +29177,69 @@
- A few are reserved because MySQL needs them and is
- (currently) using a @code{yacc} parser:
-
--@include reservedwords.texi
-+@multitable @columnfractions .33 .33 .33
-+@item @strong{Word} @tab @strong{Word} @tab @strong{Word}
-+@item @code{ADD} @tab @code{ALL} @tab @code{ALTER}
-+@item @code{ANALYZE} @tab @code{AND} @tab @code{AS}
-+@item @code{ASC} @tab @code{AUTO_INCREMENT} @tab @code{BDB}
-+@item @code{BERKELEYDB} @tab @code{BETWEEN} @tab @code{BIGINT}
-+@item @code{BINARY} @tab @code{BLOB} @tab @code{BOTH}
-+@item @code{BTREE} @tab @code{BY} @tab @code{CASCADE}
-+@item @code{CASE} @tab @code{CHANGE} @tab @code{CHAR}
-+@item @code{CHARACTER} @tab @code{COLLATE} @tab @code{COLUMN}
-+@item @code{COLUMNS} @tab @code{CONSTRAINT} @tab @code{CREATE}
-+@item @code{CROSS} @tab @code{CURRENT_DATE} @tab @code{CURRENT_TIME}
-+@item @code{CURRENT_TIMESTAMP} @tab @code{DATABASE} @tab @code{DATABASES}
-+@item @code{DAY_HOUR} @tab @code{DAY_MINUTE} @tab @code{DAY_SECOND}
-+@item @code{DEC} @tab @code{DECIMAL} @tab @code{DEFAULT}
-+@item @code{DELAYED} @tab @code{DELETE} @tab @code{DESC}
-+@item @code{DESCRIBE} @tab @code{DISTINCT} @tab @code{DISTINCTROW}
-+@item @code{DOUBLE} @tab @code{DROP} @tab @code{ELSE}
-+@item @code{ENCLOSED} @tab @code{ERRORS} @tab @code{ESCAPED}
-+@item @code{EXISTS} @tab @code{EXPLAIN} @tab @code{FIELDS}
-+@item @code{FLOAT} @tab @code{FOR} @tab @code{FOREIGN}
-+@item @code{FROM} @tab @code{FULLTEXT} @tab @code{FUNCTION}
-+@item @code{GEOMETRY} @tab @code{GRANT} @tab @code{GROUP}
-+@item @code{HASH} @tab @code{HAVING} @tab @code{HELP}
-+@item @code{HIGH_PRIORITY} @tab @code{HOUR_MINUTE} @tab @code{HOUR_SECOND}
-+@item @code{IF} @tab @code{IGNORE} @tab @code{IN}
-+@item @code{INDEX} @tab @code{INFILE} @tab @code{INNER}
-+@item @code{INNODB} @tab @code{INSERT} @tab @code{INT}
-+@item @code{INTEGER} @tab @code{INTERVAL} @tab @code{INTO}
-+@item @code{IS} @tab @code{JOIN} @tab @code{KEY}
-+@item @code{KEYS} @tab @code{KILL} @tab @code{LEADING}
-+@item @code{LEFT} @tab @code{LIKE} @tab @code{LIMIT}
-+@item @code{LINES} @tab @code{LOAD} @tab @code{LOCK}
-+@item @code{LONG} @tab @code{LONGBLOB} @tab @code{LONGTEXT}
-+@item @code{LOW_PRIORITY} @tab @code{MASTER_SERVER_ID} @tab @code{MATCH}
-+@item @code{MEDIUMBLOB} @tab @code{MEDIUMINT} @tab @code{MEDIUMTEXT}
-+@item @code{MIDDLEINT} @tab @code{MINUTE_SECOND} @tab @code{MRG_MYISAM}
-+@item @code{NATURAL} @tab @code{NOT} @tab @code{NULL}
-+@item @code{NUMERIC} @tab @code{ON} @tab @code{OPTIMIZE}
-+@item @code{OPTION} @tab @code{OPTIONALLY} @tab @code{OR}
-+@item @code{ORDER} @tab @code{OUTER} @tab @code{OUTFILE}
-+@item @code{PRECISION} @tab @code{PRIMARY} @tab @code{PRIVILEGES}
-+@item @code{PROCEDURE} @tab @code{PURGE} @tab @code{READ}
-+@item @code{REAL} @tab @code{REFERENCES} @tab @code{REGEXP}
-+@item @code{RENAME} @tab @code{REPLACE} @tab @code{REQUIRE}
-+@item @code{RESTRICT} @tab @code{RETURNS} @tab @code{REVOKE}
-+@item @code{RIGHT} @tab @code{RLIKE} @tab @code{RTREE}
-+@item @code{SELECT} @tab @code{SET} @tab @code{SHOW}
-+@item @code{SMALLINT} @tab @code{SONAME} @tab @code{SPATIAL}
-+@item @code{SQL_BIG_RESULT} @tab @code{SQL_CALC_FOUND_ROWS} @tab @code{SQL_SMALL_RESULT}
-+@item @code{SSL} @tab @code{STARTING} @tab @code{STRAIGHT_JOIN}
-+@item @code{STRIPED} @tab @code{TABLE} @tab @code{TABLES}
-+@item @code{TERMINATED} @tab @code{THEN} @tab @code{TINYBLOB}
-+@item @code{TINYINT} @tab @code{TINYTEXT} @tab @code{TO}
-+@item @code{TRAILING} @tab @code{TYPES} @tab @code{UNION}
-+@item @code{UNIQUE} @tab @code{UNLOCK} @tab @code{UNSIGNED}
-+@item @code{UPDATE} @tab @code{USAGE} @tab @code{USE}
-+@item @code{USER_RESOURCES} @tab @code{USING} @tab @code{VALUES}
-+@item @code{VARBINARY} @tab @code{VARCHAR} @tab @code{VARYING}
-+@item @code{WARNINGS} @tab @code{WHEN} @tab @code{WHERE}
-+@item @code{WITH} @tab @code{WRITE} @tab @code{XOR}
-+@item @code{YEAR_MONTH} @tab @code{ZEROFILL}
-+@end multitable
-
- The following symbols (from the table above) are disallowed by ANSI SQL
- but allowed by MySQL as column/table names. This is because some
+++ /dev/null
-diff -urN mysql-4.1.7.org/configure.in mysql-4.1.7/configure.in
---- mysql-4.1.7.org/configure.in 2004-10-27 01:35:54.930172056 +0200
-+++ mysql-4.1.7/configure.in 2004-10-27 01:39:04.368373072 +0200
-@@ -779,19 +779,20 @@
-
- AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
-
--AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
-- AC_CHECK_LIB(nsl, gethostbyname_r))
--AC_CHECK_FUNC(gethostbyname_r)
-+AC_CHECK_FUNC(gethostbyname_r, [],
-+ [AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
-+ [AC_CHECK_LIB(nsl, gethostbyname_r)])])
-
- AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
--AC_CHECK_FUNC(yp_get_default_domain, ,
-- AC_CHECK_LIB(nsl, yp_get_default_domain))
- AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
- # This may get things to compile even if bind-8 is installed
- AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
- # For crypt() on Linux
--AC_CHECK_LIB(crypt, crypt)
-+save_LIBS="$LIBS"
-+AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
-+AC_SUBST(LIBCRYPT)
- AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
-+LIBS="$save_LIBS"
-
- # For sem_xxx functions on Solaris 2.6
- AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
-diff -urN mysql-4.1.7.org/libmysql_r/Makefile.am mysql-4.1.7/libmysql_r/Makefile.am
---- mysql-4.1.7.org/libmysql_r/Makefile.am 2004-10-27 01:35:55.265121136 +0200
-+++ mysql-4.1.7/libmysql_r/Makefile.am 2004-10-27 01:36:23.574817408 +0200
-@@ -33,7 +33,7 @@
- libmysql_dir = $(top_srcdir)/libmysql
-
- libmysqlclient_r_la_SOURCES = $(target_sources)
--libmysqlclient_r_la_LIBADD = $(target_libadd)
-+libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread
- libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
-
- # This is called from the toplevel makefile
-diff -urN mysql-4.1.7.org/sql/Makefile.am mysql-4.1.7/sql/Makefile.am
---- mysql-4.1.7.org/sql/Makefile.am 2004-10-27 01:35:55.971013824 +0200
-+++ mysql-4.1.7/sql/Makefile.am 2004-10-27 01:37:07.260176224 +0200
-@@ -43,7 +43,7 @@
- @bdb_libs@ @innodb_libs@ @pstack_libs@ \
- @innodb_system_libs@ \
- @ndbcluster_libs@ @ndbcluster_system_libs@ \
-- $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@
-+ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ @LIBCRYPT@
- noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
- item_strfunc.h item_timefunc.h item_uniq.h \
- item_create.h item_subselect.h item_row.h \
+++ /dev/null
---- mysql-3.23.52/include/Makefile.am.orig Wed Aug 14 00:08:16 2002
-+++ mysql-3.23.52/include/Makefile.am Sat Aug 17 09:09:22 2002
-@@ -20,12 +20,13 @@
- mysqld_error.h my_list.h \
- my_pthread.h my_no_pthread.h raid.h errmsg.h \
- my_global.h my_net.h \
-+ my_dir.h \
- sslopt-case.h sslopt-longopts.h sslopt-usage.h \
- sslopt-vars.h $(BUILT_SOURCES)
- noinst_HEADERS = global.h config-win.h config-os2.h\
- nisam.h heap.h merge.h my_bitmap.h\
- myisam.h myisampack.h myisammrg.h ft_global.h\
-- my_dir.h mysys_err.h my_base.h \
-+ mysys_err.h my_base.h \
- my_nosys.h my_alarm.h queues.h \
- my_tree.h hash.h thr_alarm.h thr_lock.h \
- getopt.h t_ctype.h violite.h \
+++ /dev/null
-diff -urN mysql-4.0.10-gamma.org/vio/viosocket.c mysql-4.0.10-gamma/vio/viosocket.c
---- mysql-4.0.10-gamma.org/vio/viosocket.c Thu Feb 13 18:28:22 2003
-+++ mysql-4.0.10-gamma/vio/viosocket.c Thu Feb 13 18:28:35 2003
-@@ -294,9 +294,9 @@
- DBUG_PRINT("exit", ("getpeername gave error: %d", socket_errno));
- DBUG_RETURN(1);
- }
-- my_inet_ntoa(vio->remote.sin_addr,buf);
-+/* my_inet_ntoa(vio->remote.sin_addr,buf); */
- }
-- DBUG_PRINT("exit", ("addr: %s", buf));
-+/* DBUG_PRINT("exit", ("addr: %s", buf)); */
- DBUG_RETURN(0);
- }
-
+++ /dev/null
---- mysql-3.23.51/configure.in.orig Mon Jun 3 12:39:03 2002
-+++ mysql-3.23.51/configure.in Thu Jun 13 09:41:57 2002
-@@ -675,16 +675,14 @@
-
- AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
-
--AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
-- AC_CHECK_LIB(nsl, gethostbyname_r))
--AC_CHECK_FUNC(gethostbyname_r)
-+AC_CHECK_FUNC(gethostbyname_r, [],
-+ [AC_CHECK_LIB(nsl_r, gethostbyname_r,
-+ [AC_CHECK_LIB(nsl, gethostbyname_r)]
-+ )]
-+)
-
- AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
--AC_CHECK_FUNC(yp_get_default_domain, ,
-- AC_CHECK_LIB(nsl, yp_get_default_domain))
- AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
--# This may get things to compile even if bind-8 is installed
--AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
- # For crypt() on Linux
- AC_CHECK_LIB(crypt, crypt)
- AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT))
+++ /dev/null
---- mysql-3.23.56/configure.in.orig Sat Feb 10 02:57:16 2001
-+++ mysql-3.23.56/configure.in Sat Feb 10 03:21:04 2001
-@@ -1252,17 +1252,17 @@
- if test "$with_debug" = "yes"
- then
- # Medium debug.
-- CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"
-- CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
-+ CFLAGS="-DDBUG_ON -DSAFE_MUTEX $CFLAGS"
-+ CXXFLAGS="-DSAFE_MUTEX $CXXFLAGS"
- elif test "$with_debug" = "full"
- then
- # Full debug. Very slow in some cases
-- CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
-- CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
-+ CFLAGS="-DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
-+ CXXFLAGS="-DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
- else
- # Optimized version. No debug
-- CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"
-- CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
-+ CFLAGS="-DDBUG_OFF $CFLAGS"
-+ CXXFLAGS="-DDBUG_OFF $CXXFLAGS"
- fi
-
- # Force static compilation to avoid linking probles/get more speed
+++ /dev/null
-check process mysql with pidfile /var/lib/mysql/mysql.pid
- group database
- start program = "/etc/init.d/mysql restart"
- stop program = "/etc/init.d/mysql stop"
- if failed unix /var/lib/mysql/mysql.sock then restart
- if 5 restarts within 5 cycles then timeout
- depends on mysql_bin
- depends on mysql_rc
-
-check file mysql_bin with path /usr/sbin/mysqld
- group database
- if failed checksum then unmonitor
- if failed permission 755 then unmonitor
- if failed uid root then unmonitor
- if failed gid root then unmonitor
-
-check file mysql_rc with path /etc/init.d/mysql
- group database
- if failed checksum then unmonitor
- if failed permission 754 then unmonitor
- if failed uid root then unmonitor
- if failed gid root then unmonitor
-
+++ /dev/null
-# Customized settings for mysql
-
-# Define nice level for mysql
-SERVICE_RUN_NICE_LEVEL="+0"
-
-# Be compatible with RA layout (not supported)
-MYSQL_RA_COMPAT="no"
-
-# For clusters configuration look into /etc/mysql/clusters.conf
-# Don't use **obsolete** MYSQL_DB_CLUSTERS option
-
-# Skip automatic mysqld restarts invoked from rpm installs.
-#RPM_SKIP_AUTO_RESTART=yes
;character-set-server=latin2
;collation-server=latin2_general_ci
+;skip-character-set-client-handshake
+
+; set default charset
+;default-character-set = latin1
; Use passwords compatible with old 4.0 mysqld
;old-passwords
; Don't allow connections over the network by default
skip-networking
+; IP address to bind to
+;bind-address=127.0.0.1
+
+; no dns
+;skip-name-resolve
+
; Emergency option. Use only if you really need this.
;skip-grant-tables
+; replication options
+;server-id=2
+
+; skip startup of slave
+;skip-slave-start
+
+; slave setup
+;relay-log=slave-relay-bin
+;master-host=master
+;master-user=replica
+;master-port=3306
+;master-password=replica
+
+; master setup
+;log-bin
+
+; databases to be included in binlog
+;binlog-do-db=db1
+; or excluded
+;binlog-ignore-db=mysql
+;binlog-ignore-db=test
+
+; Don't flush key buffers between writes for any MyISAM
+; set this if you have dedicated slave server where writes aren't important
+;delay-key-write-for-all-tables
+
; Log connections and queries. It slows down MySQL so it's disabled by default
;log = /var/log/mysql/log
;set-variable = sort_buffer_size=2M
;set-variable = table_cache=64
;set-variable = tmp_table_size=1M
+;set-variable = max_heap_table_size=32M
+;set-variable = thread_cache_size=16
;set-variable = thread_stack=65536
+; Try number of CPU's*2
+;set-variable = thread_concurrency=8
;set-variable = wait_timeout=28800
;set-variable = query_cache_size=8M
;set-variable = query_cache_limit=1M
+; replication local log
+;set-variable = max_relay_log_size=256M
+; max size of master binlog files
+;set-variable = max_binlog_size=256M
;
user = mysql_logrotate
password =
-; vim=syn=dosini
+; vim:syn=dosini
projects / packages / mysql.git / commitdiff