18 commits

Author	SHA1	Message	Date
Otto Kekäläinen	d6c5e7e2cc	Merge branch '10.1' of https://github.com/MariaDB/server into ok-debpkg-10.1	2015-09-05 21:28:14 +03:00
Sergei Golubchik	530a6e7481	Merge branch '10.0' into 10.1 ... referenced_by_foreign_key2(), needed for InnoDB to compile, was taken from 10.0-galera	2015-09-03 12:58:41 +02:00
Otto Kekäläinen	61e31aa5d4	Remove files from debian/* that are unrelevant for this upstream repo ... * README and NEWS are very old and mostly plain wrong and not needed * Lintian-overrides are relevant only in actual Debian QA systems * watch file was plain wrong and anyway relevant only in downstream distros	2015-07-22 11:29:21 +03:00
Sergey Vojtovich	94bc50650e	MDEV-8374 - Debian: mysqld_safe Can't log to error log and syslog at the same time ... Let mysqld_safe_syslog.cnf force disable error log so that logging to syslog is not affected by previous log_error setting. Added handling of --skip-log-error to mysqld_safe.	2015-07-16 14:03:29 +04:00
Nirbhay Choubey	023366e6eb	Moved wsrep_slave_threads to optional settings.	2014-09-24 12:17:29 -04:00
Nirbhay Choubey	e207e5fe27	Updated config files: ... - Removed QC restriction - Added bind-address Fixed file permissions for wsrep_sst_rsync.sh. Removed some unnecessary files.	2014-09-23 14:33:27 -04:00
Nirbhay Choubey	746c755d42	MDEV-6495: local merge from maria-5.5-galera.	2014-08-05 19:00:54 -04:00
Nirbhay Choubey	e5cea60933	Local merge of patch for MDEV-3896 from maria-5.5-galera.	2014-07-21 17:27:06 -04:00
Sergei Golubchik	de8cb7a1f3	MDEV-5485 Minor man pages formatting issues ... MDEV-6281 Typo in mysql_install_db scripts and collateral changes: * remove mysql_tableinfo.1 and references to it (there's no mysql_tableinfo) * for debian: create manpages for mysqlrepair, mysqlanalyze, mysqloptimize (as symlinks for mysqlcheck.1, just as executables are symlinks to mysqlcheck) * remove mysqlmanager.8 and references to it * correct "very long line" error in mysqladmin.1 * simplify and fix table formatting in mysqlbinlog.1 and mysqldump.1 * fix a typo in the help text in mysql_install_db * aria_chk: say "for Linux on x86_64", like other tools do (not "for Linux at x86_64") * add simple manpages for aria_* utilities	2014-05-30 23:19:26 +02:00
unknown	19e03c683e	The variable "table_cache" is deprecated, use the new name "table_open_cache" instead. ... Thanks to Ivoz for pointing this out.	2012-07-05 09:29:34 +02:00
Sergei Golubchik	7fcfdf7c16	client's option is default-character-set, server's is character-set-server	2012-06-07 19:15:41 +02:00
Sergei Golubchik	648c8c2619	don't use deprecated options in the installed config files	2012-05-30 19:11:59 +02:00
unknown	595cbf0927	Revert some earlier changes to my.cnf and mariadb.cnf. ... I want to avoid that upgrades silently change important config parameters that users have come to rely on. This could happen if users changed their my.cnf themselves, and then an upgrade introduces mariadb.cnf which silently overrides the settings in my.cnf. Avoid this by having mariadb.cnf mostly empty for now, and in the future we can add just new mariadb-specific options there that do not break existing installations.	2012-01-27 12:14:41 +01:00
unknown	438ed0408c	.deb packaging fixes: make mariadb-common a real package, which depends on ... mysql-common and places mariadb-specific stuff in /etc/mysql/conf.d/mariadb.cnf. This should allow to co-exist with default Debian mysql-common package and help resolve dependencies when installing mariadb among multiple available versions of MySQL from different repositories.	2012-01-26 12:55:12 +01:00
unknown	92bd8a5c60	More small 5.5 .deb packaging fixes found in Buildbot tests.	2012-01-24 12:27:44 +01:00
unknown	cfd4fcb0bc	Initial draft for building .deb packages for MariaDB 5.5.	2012-01-23 12:20:16 +01:00
unknown	c236111f6c	Removed debian dir. It was a mistake to embed it in the tree in the first place. ... BitKeeper/deleted/.del-Makefile.am~2cb643bedd5f474: Delete: debian/Makefile.am BitKeeper/deleted/.del-README.Maintainer: Delete: debian/README.Maintainer BitKeeper/deleted/.del-changelog: Delete: debian/changelog BitKeeper/deleted/.del-compat: Delete: debian/compat BitKeeper/deleted/.del-control.in: Delete: debian/control.in BitKeeper/deleted/.del-copyright.more: Delete: debian/copyright.more BitKeeper/deleted/.del-copyright: Delete: debian/copyright BitKeeper/deleted/.del-defs.mk.in: Delete: debian/defs.mk.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.README.Maintainer.in: Delete: debian/libmysqlclientSLIB-dev.README.Maintainer.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.dirs.in: Delete: debian/libmysqlclientSLIB-dev.dirs.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.docs.in: Delete: debian/libmysqlclientSLIB-dev.docs.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.examples.in: Delete: debian/libmysqlclientSLIB-dev.examples.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in: Delete: debian/libmysqlclientSLIB-dev.files.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.links.in: Delete: debian/libmysqlclientSLIB-dev.links.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.README.Debian.in: Delete: debian/libmysqlclientSLIBoff.README.Debian.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.dirs.in: Delete: debian/libmysqlclientSLIBoff.dirs.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.docs.in: Delete: debian/libmysqlclientSLIBoff.docs.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.files.in: Delete: debian/libmysqlclientSLIBoff.files.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.postinst.in: Delete: debian/libmysqlclientSLIBoff.postinst.in BitKeeper/deleted/.del-libndbclientNLIB-dev.dirs.in: Delete: debian/libndbclientNLIB-dev.dirs.in BitKeeper/deleted/.del-libndbclientNLIB-dev.files.in: Delete: debian/libndbclientNLIB-dev.files.in BitKeeper/deleted/.del-libndbclientNLIB-dev.links.in: Delete: debian/libndbclientNLIB-dev.links.in BitKeeper/deleted/.del-libndbclientNLIB.README.Debian.in: Delete: debian/libndbclientNLIB.README.Debian.in BitKeeper/deleted/.del-libndbclientNLIB.dirs.in: Delete: debian/libndbclientNLIB.dirs.in BitKeeper/deleted/.del-libndbclientNLIB.files.in: Delete: debian/libndbclientNLIB.files.in BitKeeper/deleted/.del-libndbclientNLIB.postinst.in: Delete: debian/libndbclientNLIB.postinst.in BitKeeper/deleted/.del-mysql-client-BASE.NEWS.in: Delete: debian/mysql-client-BASE.NEWS.in BitKeeper/deleted/.del-mysql-client-BASE.README.Debian.in: Delete: debian/mysql-client-BASE.README.Debian.in BitKeeper/deleted/.del-mysql-client-BASE.dirs.in: Delete: debian/mysql-client-BASE.dirs.in BitKeeper/deleted/.del-mysql-client-BASE.docs.in: Delete: debian/mysql-client-BASE.docs.in BitKeeper/deleted/.del-mysql-client-BASE.files.in: Delete: debian/mysql-client-BASE.files.in BitKeeper/deleted/.del-mysql-client-BASE.lintian-overrides.in: Delete: debian/mysql-client-BASE.lintian-overrides.in BitKeeper/deleted/.del-mysql-common.README.Debian.in: Delete: debian/mysql-common.README.Debian.in BitKeeper/deleted/.del-mysql-common.dirs.in: Delete: debian/mysql-common.dirs.in BitKeeper/deleted/.del-mysql-common.files.in: Delete: debian/mysql-common.files.in BitKeeper/deleted/.del-mysql-common.postrm.in: Delete: debian/mysql-common.postrm.in BitKeeper/deleted/.del-mysql-common.preinst.in: Delete: debian/mysql-common.preinst.in BitKeeper/deleted/.del-mysql-extra-BASE.dirs.in: Delete: debian/mysql-extra-BASE.dirs.in BitKeeper/deleted/.del-mysql-extra-BASE.files.in: Delete: debian/mysql-extra-BASE.files.in BitKeeper/deleted/.del-mysql-management-BASE.dirs.in: Delete: debian/mysql-management-BASE.dirs.in BitKeeper/deleted/.del-mysql-management-BASE.files.in: Delete: debian/mysql-management-BASE.files.in BitKeeper/deleted/.del-mysql-management-BASE.mysql-management.init.in: Delete: debian/mysql-management-BASE.mysql-management.init.in BitKeeper/deleted/.del-mysql-server-BASE.NEWS.in: Delete: debian/mysql-server-BASE.NEWS.in BitKeeper/deleted/.del-mysql-server-BASE.README.Debian.in: Delete: debian/mysql-server-BASE.README.Debian.in BitKeeper/deleted/.del-mysql-server-BASE.config.in: Delete: debian/mysql-server-BASE.config.in BitKeeper/deleted/.del-mysql-server-BASE.dirs.in: Delete: debian/mysql-server-BASE.dirs.in BitKeeper/deleted/.del-mysql-server-BASE.docs.in: Delete: debian/mysql-server-BASE.docs.in BitKeeper/deleted/.del-mysql-server-BASE.files.in: Delete: debian/mysql-server-BASE.files.in BitKeeper/deleted/.del-mysql-server-BASE.links.in: Delete: debian/mysql-server-BASE.links.in BitKeeper/deleted/.del-mysql-server-BASE.lintian-overrides.in: Delete: debian/mysql-server-BASE.lintian-overrides.in BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.paranoid.in: Delete: debian/mysql-server-BASE.logcheck.ignore.paranoid.in BitKeeper/deleted/.del-my.cnf: Delete: debian/additions/my.cnf BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.server.in: Delete: debian/mysql-server-BASE.logcheck.ignore.server.in BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.workstation.in: Delete: debian/mysql-server-BASE.logcheck.ignore.workstation.in BitKeeper/deleted/.del-mysql-server-BASE.mysql-server.logrotate.in: Delete: debian/mysql-server-BASE.mysql-server.logrotate.in BitKeeper/deleted/.del-mysql-server-BASE.postinst.in: Delete: debian/mysql-server-BASE.postinst.in BitKeeper/deleted/.del-mysql-server-BASE.postrm.in: Delete: debian/mysql-server-BASE.postrm.in BitKeeper/deleted/.del-mysql-server-BASE.preinst.in: Delete: debian/mysql-server-BASE.preinst.in BitKeeper/deleted/.del-mysql-server-BASE.prerm.in: Delete: debian/mysql-server-BASE.prerm.in BitKeeper/deleted/.del-mysql-server-BASE.templates.in: Delete: debian/mysql-server-BASE.templates.in BitKeeper/deleted/.del-mysql-server-PREV.preinst.in: Delete: debian/mysql-server-PREV.preinst.in BitKeeper/deleted/.del-mysql-server.lintian-overrides: Delete: debian/additions/mysql-server.lintian-overrides BitKeeper/deleted/.del-mysql-server.preinst.in: Delete: debian/mysql-server.preinst.in BitKeeper/deleted/.del-mysql-storage-BASE.dirs.in: Delete: debian/mysql-storage-BASE.dirs.in BitKeeper/deleted/.del-mysql-storage-BASE.files.in: Delete: debian/mysql-storage-BASE.files.in BitKeeper/deleted/.del-mysql-storage-BASE.mysql-storage.init.in: Delete: debian/mysql-storage-BASE.mysql-storage.init.in BitKeeper/deleted/.del-mysql-test-BASE.dirs.in: Delete: debian/mysql-test-BASE.dirs.in BitKeeper/deleted/.del-mysql-test-BASE.files.in: Delete: debian/mysql-test-BASE.files.in BitKeeper/deleted/.del-mysql-tools-BASE.dirs.in: Delete: debian/mysql-tools-BASE.dirs.in BitKeeper/deleted/.del-mysql-tools-BASE.files.in: Delete: debian/mysql-tools-BASE.files.in BitKeeper/deleted/.del-rules: Delete: debian/rules BitKeeper/deleted/.del-source.lintian-overrides.in: Delete: debian/source.lintian-overrides.in BitKeeper/deleted/.del-watch: Delete: debian/watch BitKeeper/deleted/.del-POTFILES.in.in: Delete: debian/po/POTFILES.in.in BitKeeper/deleted/.del-ca.po: Delete: debian/po/ca.po BitKeeper/deleted/.del-cs.po: Delete: debian/po/cs.po BitKeeper/deleted/.del-da.po: Delete: debian/po/da.po BitKeeper/deleted/.del-de.po: Delete: debian/po/de.po BitKeeper/deleted/.del-es.po: Delete: debian/po/es.po BitKeeper/deleted/.del-eu.po: Delete: debian/po/eu.po BitKeeper/deleted/.del-fr.po: Delete: debian/po/fr.po BitKeeper/deleted/.del-gl.po: Delete: debian/po/gl.po BitKeeper/deleted/.del-it.po: Delete: debian/po/it.po BitKeeper/deleted/.del-ja.po: Delete: debian/po/ja.po BitKeeper/deleted/.del-nb.po: Delete: debian/po/nb.po BitKeeper/deleted/.del-ndb_mgmd.cnf: Delete: debian/additions/ndb_mgmd.cnf BitKeeper/deleted/.del-nl.po: Delete: debian/po/nl.po BitKeeper/deleted/.del-pt.po: Delete: debian/po/pt.po BitKeeper/deleted/.del-pt_BR.po: Delete: debian/po/pt_BR.po BitKeeper/deleted/.del-ro.po: Delete: debian/po/ro.po BitKeeper/deleted/.del-ru.po: Delete: debian/po/ru.po BitKeeper/deleted/.del-sv.po: Delete: debian/po/sv.po BitKeeper/deleted/.del-templates.pot: Delete: debian/po/templates.pot BitKeeper/deleted/.del-tr.po: Delete: debian/po/tr.po	2007-10-12 02:15:32 -07:00
unknown	359594ccd2	Adding files to support building for debian. ... --- Removed reference to debian svn location of debian dir. Changed verbage of comment to appease Timothy. --- Removed added manpages that aren't appropriate for our build. --- Added debian dir to list of dist targets. Added list of files needed to be distributed in debian dir. --- Added semi-colons to fix syntax error. --- BUG#27769 MySQL should include debian packaing dir Added debian/Makefile to configure.in to support make dist. BitKeeper/deleted/.del-configure.in.rej: Delete: configure.in.rej Makefile.am: Added debian dir to list of dist targets. configure.in: Added debian/Makefile to configure.in to support make dist BitKeeper/deleted/.del-comp_err.1: Adding files to support building for debian. BitKeeper/deleted/.del-msql2mysql.1: Adding files to support building for debian. BitKeeper/deleted/.del-my_print_defaults.1: Adding files to support building for debian. BitKeeper/deleted/.del-myisam_ftdump.1: Adding files to support building for debian. BitKeeper/deleted/.del-myisamchk.1: Adding files to support building for debian. BitKeeper/deleted/.del-myisamlog.1: Adding files to support building for debian. BitKeeper/deleted/.del-myisampack.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_config.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_convert_table_format.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_explain_log.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_find_rows.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_fix_extensions.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_install_db.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_secure_installation.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_setpermission.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_tableinfo.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_waitpid.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlbinlog.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlbug.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlcheck.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqldumpslow.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlimport.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlmanager.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqltest.1: Adding files to support building for debian. BitKeeper/deleted/.del-pack_isam.1: Adding files to support building for debian. BitKeeper/deleted/.del-resolve_stack_dump.1: Adding files to support building for debian. BitKeeper/deleted/.del-resolveip.1: Adding files to support building for debian. debian/Makefile.am: Added list of files needed to be distributed in debian dir. debian/README.Maintainer: Adding files to support building for debian. --- Removed reference to debian svn location of debian dir. Changed verbage of comment to appease Timothy. debian/changelog: Adding files to support building for debian. debian/compat: Adding files to support building for debian. debian/control.in: Adding files to support building for debian. debian/copyright.more: Adding files to support building for debian. debian/copyright: Adding files to support building for debian. debian/defs.mk: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.README.Maintainer.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.dirs.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.docs.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.examples.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.files.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.links.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.README.Debian.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.dirs.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.docs.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.files.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.postinst.in: Adding files to support building for debian. debian/libndbclientNDBSOVER-dev.dirs.in: Adding files to support building for debian. debian/libndbclientNDBSOVER-dev.files.in: Adding files to support building for debian. debian/libndbclientNDBSOVER-dev.links.in: Adding files to support building for debian. debian/libndbclientNDBSOVER.README.Debian.in: Adding files to support building for debian. debian/libndbclientNDBSOVER.dirs.in: Adding files to support building for debian. debian/libndbclientNDBSOVER.files.in: Adding files to support building for debian. debian/libndbclientNDBSOVER.postinst.in: Adding files to support building for debian. debian/mysql-client-MYVER.NEWS.in: Adding files to support building for debian. debian/mysql-client-MYVER.README.Debian.in: Adding files to support building for debian. debian/mysql-client-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-client-MYVER.docs.in: Adding files to support building for debian. debian/mysql-client-MYVER.files.in: Adding files to support building for debian. debian/mysql-client-MYVER.lintian-overrides.in: Adding files to support building for debian. debian/mysql-common.README.Debian.in: Adding files to support building for debian. debian/mysql-common.dirs.in: Adding files to support building for debian. debian/mysql-common.files.in: Adding files to support building for debian. debian/mysql-common.postrm.in: Adding files to support building for debian. debian/mysql-common.preinst.in: Adding files to support building for debian. debian/mysql-extra-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-extra-MYVER.files.in: Adding files to support building for debian. debian/mysql-management-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-management-MYVER.files.in: Adding files to support building for debian. debian/mysql-management-MYVER.mysql-management.init.in: Adding files to support building for debian. debian/mysql-server-MYOLDVER.preinst.in: Adding files to support building for debian. debian/mysql-server-MYVER.NEWS.in: Adding files to support building for debian. debian/mysql-server-MYVER.README.Debian.in: Adding files to support building for debian. debian/mysql-server-MYVER.config.in: Adding files to support building for debian. debian/mysql-server-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-server-MYVER.docs.in: Adding files to support building for debian. debian/mysql-server-MYVER.files.in: Adding files to support building for debian. debian/mysql-server-MYVER.links.in: Adding files to support building for debian. debian/mysql-server-MYVER.lintian-overrides.in: Adding files to support building for debian. debian/mysql-server-MYVER.logcheck.ignore.paranoid.in: Adding files to support building for debian. debian/mysql-server-MYVER.logcheck.ignore.server.in: Adding files to support building for debian. debian/mysql-server-MYVER.logcheck.ignore.workstation.in: Adding files to support building for debian. debian/mysql-server-MYVER.mysql-server.logrotate.in: Adding files to support building for debian. debian/mysql-server-MYVER.postinst.in: Adding files to support building for debian. debian/mysql-server-MYVER.postrm.in: Adding files to support building for debian. debian/additions/my.cnf: Adding files to support building for debian. debian/additions/mysql-server.lintian-overrides: Adding files to support building for debian. debian/additions/ndb_mgmd.cnf: Adding files to support building for debian. debian/mysql-server-MYVER.preinst.in: Adding files to support building for debian. debian/mysql-server-MYVER.prerm.in: Adding files to support building for debian. debian/mysql-server-MYVER.templates.in: Adding files to support building for debian. debian/mysql-server.preinst.in: Adding files to support building for debian. debian/mysql-storage-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-storage-MYVER.files.in: Adding files to support building for debian. debian/mysql-storage-MYVER.mysql-storage.init.in: Adding files to support building for debian. debian/mysql-test-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-test-MYVER.files.in: Adding files to support building for debian. debian/mysql-tools-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-tools-MYVER.files.in: Adding files to support building for debian. debian/po/POTFILES.in.in: Adding files to support building for debian. debian/po/ca.po: Adding files to support building for debian. debian/po/cs.po: Adding files to support building for debian. debian/po/da.po: Adding files to support building for debian. debian/po/de.po: Adding files to support building for debian. debian/po/es.po: Adding files to support building for debian. debian/po/eu.po: Adding files to support building for debian. debian/po/fr.po: Adding files to support building for debian. debian/po/gl.po: Adding files to support building for debian. debian/po/it.po: Adding files to support building for debian. debian/po/ja.po: Adding files to support building for debian. debian/po/nb.po: Adding files to support building for debian. debian/po/nl.po: Adding files to support building for debian. debian/po/pt.po: Adding files to support building for debian. debian/po/pt_BR.po: Adding files to support building for debian. debian/po/ro.po: Adding files to support building for debian. debian/po/ru.po: Adding files to support building for debian. debian/po/sv.po: Adding files to support building for debian. debian/po/templates.pot: Adding files to support building for debian. debian/po/tr.po: Adding files to support building for debian. debian/rules: Adding files to support building for debian. --- Added semi-colons to fix syntax error. debian/source.lintian-overrides.in: Adding files to support building for debian. debian/watch: Adding files to support building for debian.	2007-04-11 16:13:09 -07:00