Commit 709bb394 authored by mtaylor@solace.(none)'s avatar mtaylor@solace.(none)
Browse files

Removed debian dir. It was a mistake to embed it in the tree in the first place.

parent 97927cfe

Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ 
			@thread_dirs@ pstack \

			@sql_union_dirs@ scripts @man_dirs@ tests SSL\

			BUILD netware os2 @libmysqld_dirs@ \

			@bench_dirs@ support-files @tools_dirs@ win \

			debian

			@bench_dirs@ support-files @tools_dirs@ win



# Run these targets before any others, also make part of clean target,

# to make sure we create new links after a clean.

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -3017,7 +3017,6 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl 
 cmd-line-utils/libedit/Makefile dnl

 win/Makefile dnl

 zlib/Makefile dnl

 debian/Makefile debian/defs.mk debian/control dnl

 cmd-line-utils/readline/Makefile)

 AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)

 AC_OUTPUT

debian/Makefile.am

deleted100644 → 0
+0 −118
Original line number Diff line number Diff line 
# Copyright (C) 2006 MySQL AB

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; version 2 of the License.

#

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with this program; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA



## Process this file with automake to create Makefile.in

EXTRA_DIST =  \

	mysql-test-BASE.files.in \

	libndbclientNLIB-dev.files.in \

	mysql-server-BASE.config.in \

	libndbclientNLIB.README.Debian.in \

	mysql-server-BASE.postrm.in \

	mysql-server-BASE.NEWS.in \

	libndbclientNLIB.postinst.in \

	mysql-server-BASE.links.in \

	libndbclientNLIB.files.in \

	source.lintian-overrides.in \

	mysql-server-BASE.docs.in \

	libmysqlclientSLIBoff.files.in \

	mysql-server-BASE.files.in \

	libndbclientNLIB-dev.links.in \

	libmysqlclientSLIBoff.postinst.in \

	mysql-extra-BASE.dirs.in \

	libmysqlclientSLIB-dev.links.in \

	mysql-server-BASE.dirs.in \

	libmysqlclientSLIB-dev.examples.in \

	mysql-client-BASE.lintian-overrides.in \

	copyright.more \

	libndbclientNLIB-dev.dirs.in \

	mysql-server-BASE.README.Debian.in \

	libmysqlclientSLIBoff.docs.in \

	compat \

	mysql-test-BASE.dirs.in \

	libmysqlclientSLIB-dev.files.in \

	libmysqlclientSLIBoff.dirs.in \

	mysql-server-BASE.logcheck.ignore.server.in \

	mysql-storage-BASE.mysql-storage.init.in \

	libmysqlclientSLIBoff.README.Debian.in \

	mysql-client-BASE.README.Debian.in \

	Makefile.am \

	mysql-server-BASE.prerm.in \

	mysql-common.dirs.in \

	defs.mk \

	defs.mk.in \

	mysql-server-BASE.mysql-server.logrotate.in \

	mysql-common.README.Debian.in \

	copyright \

	mysql-storage-BASE.dirs.in \

	mysql-common.preinst.in \

	mysql-client-BASE.files.in \

	mysql-server-BASE.templates.in \

	mysql-tools-BASE.dirs.in \

	mysql-management-BASE.mysql-management.init.in \

	watch \

	mysql-common.postrm.in \

	mysql-server-BASE.preinst.in \

	README.Maintainer \

	mysql-tools-BASE.files.in \

	mysql-client-BASE.NEWS.in \

	mysql-server-BASE.lintian-overrides.in \

	changelog \

	mysql-server-BASE.logcheck.ignore.paranoid.in \

	mysql-common.files.in \

	mysql-server-BASE.logcheck.ignore.workstation.in \

	mysql-extra-BASE.files.in \

	mysql-management-BASE.files.in \

	mysql-client-BASE.docs.in \

	libmysqlclientSLIB-dev.README.Maintainer.in \

	mysql-storage-BASE.files.in \

	additions \

	additions/ndb_mgmd.cnf \

	additions/mysql-server.lintian-overrides \

	additions/my.cnf \

	mysql-server-BASE.postinst.in \

	libndbclientNLIB.dirs.in \

	po \

	po/fr.po \

	po/sv.po \

	po/da.po \

	po/es.po \

	po/ja.po \

	po/tr.po \

	po/nb.po \

	po/POTFILES.in.in \

	po/cs.po \

	po/pt.po \

	po/gl.po \

	po/pt_BR.po \

	po/nl.po \

	po/templates.pot \

	po/de.po \

	po/eu.po \

	po/ro.po \

	po/ru.po \

	po/it.po \

	po/ca.po \

	mysql-client-BASE.dirs.in \

	control.in \

	libmysqlclientSLIB-dev.dirs.in \

	mysql-server-PREV.preinst.in \

	mysql-server.preinst.in \

	mysql-management-BASE.dirs.in \

	rules \

	libmysqlclientSLIB-dev.docs.in



# Don't update the files from bitkeeper

%::SCCS/s.%

debian/README.Maintainer

deleted100644 → 0
+0 −99
Original line number Diff line number Diff line 
###########################################################################

# Here are some information that are only of interest to the Debiani      #

#   maintainers of MySQL.                                                 # 

###########################################################################



#

# Remarks to dependencies

#

libwrap0-dev (>= 7.6-8.3)

	According to bug report 114582 where where build problems on

	IA-64/sid with at least two prior versions.

psmisc

	/usr/bin/killall in the initscript



zlib1g in libmysqlclient-dev:	

	"mysql_config --libs" adds "-lz"



Build-Dep:



debhelper (>=4.1.16):

	See po-debconf(7).



autoconf (>= 2.13-20), automake1.7

	Try to get rid of them.



doxygen, tetex-bin, tetex-extra, gs

	for ndb/docs/*tex



mysql-server-5.0: Pre-Depends: mysql-common

	This was necessary as mysql-server-5.0.preinst checks for unmodified

	conffiles from mysql-server-4.1 and copies 5.0 ones over them to avoid

	unnecessary dpkg questions. As mysql-server-5.0 is not unpacked at its 

	pre-inst stage, it had to copy those files from a package that is 

	definetly already unpacked which does not have to be the case with Depends.



#

# Remarks to the start scripts

#



## initscripts rely on mysqladmin from a different package

We have the problem that "/etc/init.d/mysql stop" relies on mysqladmin which

is in another package (mysql-client) and a passwordless access that's maybe

only available if the user configured his /root/.my.cnf. Can this be a problem?

* normal mode: not because the user is required to have it. Else:

* purge/remove: not, same as normal mode

* upgrade: not, same as normal mode

* first install: not, it depends on mysql-client which at least is unpacked

                 so mysqladmin is there (to ping). It is not yet configured

		passwordles but if there's a server running then there's a

                /root/.my.cnf. Anyways, we simply kill anything that's mysqld.



## Passwordless access for the maintainer scripts

Another issue is that the scripts needs passwordless access. To ensure this

a debian-sys-maint user is configured which has process and shutdown privs.

The file with the randomly (that's important!) generated password must be

present as long as the databases remain installed because else a new install

would have no access. This file should be used like:

	mysqladmin --defaults-file=/etc/mysql/debian.cnf restart

to avoid providing the password in plaintext on a commandline where it would 

be visible to any user via the "ps" command.



## When to start the daemon?

We aim to give the admin full control on when MySQL is running.

Issues to be faced here:

OLD:

        1. Debconf asks whether MySQL should be started on boot so update-rc.d is

           only run if the answer has been yes. The admin is likely to forget

           this decision but update-rc.d checks for an existing line in

           /etc/runlevel.conf and leaves it intact.

        2. On initial install, if the answer is yes, the daemon has to be started.

        3. On upgrades it should only be started if it was already running, everything

           else is confusing. Especiall relying on an debconf decision made month ago

           is considered suboptimal. See bug #274264

        Implementation so far:

        prerm (called on upgrade before stopping the server): 

          check for a running server and set flag if necessary

        preinst (called on initial install and before unpacking when upgrading):

          check for the debconf variable and set flag if necessary

        postinst (called on initial install and after each upgrade after unpacking):

          call update-rc.d if debconf says yes

          call invoce-rc.d if the flag has been set

        Problems remaining:

          dpkg-reconfigure and setting mysql start on boot to yes did not start mysql

          (ok "start on boot" literally does not mean "start now" so that might have been ok)

NEW:

        1. --- no debconf anymore for the sake of simplicity. We have runlevel.conf,

           the admin should use it

        2. On initial install the server is started.

        3. On upgrades the server is started exactly if it was running before so the

           runlevel configuration is irrelevant. It will be preserved by the mean of

           update-rc.d's builtin check.

        Implementation:

        prerm (called on upgrade before stopping the server):

          check for a running server and set flag if necessary

        preinst (called on initial install and before unpacking when upgrading):

          check for $1 beeing (initial) "install" and set flag

        postinst (called on initial install and after each upgrade after unpacking):

          call update-rc.d

          call invoce-rc.d if the flag has been set

debian/additions/my.cnf

deleted100644 → 0
+0 −134
Original line number Diff line number Diff line 
#

# The MySQL database server configuration file.

#

# You can copy this to one of:

# - "/etc/mysql/my.cnf" to set global options,

# - "~/.my.cnf" to set user-specific options.

# 

# One can use all long options that the program supports.

# Run program with --help to get a list of available options and with

# --print-defaults to see which it would actually understand and use.

#

# For explanations see

# http://dev.mysql.com/doc/mysql/en/server-system-variables.html



# This will be passed to all mysql clients

# It has been reported that passwords should be enclosed with ticks/quotes

# escpecially if they contain "#" chars...

# Remember to edit /etc/mysql/debian.cnf when changing the socket location.

[client]

port		= 3306

socket		= /var/run/mysqld/mysqld.sock



# Here is entries for some specific programs

# The following values assume you have at least 32M ram



# This was formally known as [safe_mysqld]. Both versions are currently parsed.

[mysqld_safe]

socket		= /var/run/mysqld/mysqld.sock

nice		= 0



[mysqld]

#

# * Basic Settings

#

user		= mysql

pid-file	= /var/run/mysqld/mysqld.pid

socket		= /var/run/mysqld/mysqld.sock

port		= 3306

basedir		= /usr

datadir		= /var/lib/mysql

tmpdir		= /tmp

language	= /usr/share/mysql/english

skip-external-locking

#

# Instead of skip-networking the default is now to listen only on

# localhost which is more compatible and is not less secure.

bind-address		= 127.0.0.1

#

# * Fine Tuning

#

key_buffer		= 16M

max_allowed_packet	= 16M

thread_stack		= 128K

thread_cache_size	= 8

#

# * Query Cache Configuration

#

query_cache_limit	= 1048576

query_cache_size        = 16777216

query_cache_type        = 1

#

# * Logging and Replication

#

# Both location gets rotated by the cronjob.

# Be aware that this log type is a performance killer.

#log		= /var/log/mysql/mysql.log

#

# Error logging goes to syslog. This is a Debian improvement :)

#

# Here you can see queries with especially long duration

#log_slow_queries	= /var/log/mysql/mysql-slow.log

#

# The following can be used as easy to replay backup logs or for replication.

#server-id		= 1

log_bin			= /var/log/mysql/mysql-bin.log

# WARNING: Using expire_logs_days without bin_log crashes the server! See README.Debian!

expire_logs_days	= 10

max_binlog_size         = 100M

#binlog_do_db		= include_database_name

#binlog_ignore_db	= include_database_name

#

# * BerkeleyDB

#

# Using BerkeleyDB is now discouraged as its support will cease in 5.1.12.

skip-bdb

#

# * InnoDB

#

# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.

# Read the manual for more InnoDB related options. There are many!

# You might want to disable InnoDB to shrink the mysqld process by circa 100MB.

#skip-innodb

#

# * Security Features

#

# Read the manual, too, if you want chroot!

# chroot = /var/lib/mysql/

#

# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".

#

# ssl-ca=/etc/mysql/cacert.pem

# ssl-cert=/etc/mysql/server-cert.pem

# ssl-key=/etc/mysql/server-key.pem







[mysqldump]

quick

quote-names

max_allowed_packet	= 16M



[mysql]

#no-auto-rehash	# faster start of mysql but no tab completition



[isamchk]

key_buffer		= 16M



#

# * NDB Cluster

#

# See /usr/share/doc/mysql-server-*/README.Debian for more information.

#

# The following configuration is read by the NDB Data Nodes (ndbd processes)

# not from the NDB Management Nodes (ndb_mgmd processes).

#

# [MYSQL_CLUSTER]

# ndb-connectstring=127.0.0.1





#

# * IMPORTANT: Additional settings that can override those from this file!

#

!includedir /etc/mysql/conf.d/