summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAgeFilesLines
* fixes for builbot 1Sergei Golubchik2013-10-201-6/+6
|
* 5.5.33a mergeSergei Golubchik2013-09-202-2/+4
|\
| * MDEV-5035 debian package conflict libmariadbclient18 5.5.33+maria-1~wheezy ↵Sergei Golubchik2013-09-192-2/+4
| | | | | | | | vs. mariadb-server-5.3 5.3.12-mariadb122~wheezy
* | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-1811-11/+83
|\ \ | |/
| * fix upgrades when mariadb-galera-server-5.5 is installedSergei Golubchik2013-09-182-4/+4
| |
| * mariadb-tokudb-engine deb package is not architecture-independentSergei Golubchik2013-09-172-2/+2
| |
| * specify deb conflicts correctlySergei Golubchik2013-09-162-4/+4
| |
| * introduce sysconf2dir, install tokudb.conf there, both in rpm and debSergei Golubchik2013-09-101-0/+1
| |
| * INSTALL_DOCUMENTATION function for CMakeLists.txtSergei Golubchik2013-09-101-2/+2
| | | | | | | | It puts files in the correct location for rpm/deb packages.
| * * mariadb-tokudb-engine-5.5.debSergei Golubchik2013-09-1010-8/+82
| | | | | | | | | | | | | | | | | | * now only production-use server plugins are in mariadb-server. client plugins are now in libmariadbclient18, testing-only server plugins are now in mariadb-test (set Coflicts: field properly) * fix Architecture: of mariadb-test * terrible hack to support optional deb packages for optional plugins
| * remove PBXTSergei Golubchik2013-08-301-3/+0
| |
* | 5.5 mergeSergei Golubchik2013-07-171-2/+2
|\ \ | |/
| * MDEV-703 LP:870310 - killall -9 in init-scriptSergei Golubchik2013-06-131-1/+1
| |
| * MDEV-4509 mysql init script should accept argumentsSergei Golubchik2013-06-121-1/+1
| | | | | | | | | | fix the init script for .deb packages (rpm's were fine already)
* | 5.5 mergeSergei Golubchik2013-06-062-6/+6
|\ \ | |/
| * MDEV-4266 Server upgrade via apt-get install does not work.Alexey Botchkov2013-05-152-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now empty 'highlevel' packages strictly depend on the same versions of files. These are mariadb-server, mariadb-client, mariadb-test per-file comments: debian/dist/Debian/control MDEV-4266 Server upgrade via apt-get install does not work. dependencies on the current version added. debian/dist/Ubuntu/control MDEV-4266 Server upgrade via apt-get install does not work. dependencies on the current version added.
* | Merge 5.5->10.0-baseunknown2013-04-171-2/+2
|\ \ | |/
| * MDEV-3882: .deb versions lower than upstream repo, causing install failureunknown2013-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | The official Debian Wheezy MySQL packages have versions like 5.5.30+dfsg-xxx. Such version is larger than 5.5.30-yyy, so apt prefers it. So use instead 5.5.30+maria-yyy, which is larger and can be pulled in automatically by apt. Also included are a couple of fixes for test failures in buildbot.
* | Fixes for stuff seen in buildbot:unknown2013-04-162-2/+2
|/ | | | | | | | | | - Fix embedded build - Backport disable of fallocate, it creates too short ibdata1 when used with O_DIRECT on old kernels - Do not disable innodb during .deb install, we need it for mysql.rpl_slave_state table.
* update debian patch to applySergei Golubchik2013-01-151-10/+10
|
* Buildbot fixes and cleanups:Michael Widenius2013-01-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added --verbose to BUILD scripts to get make to write out compile commands. - Detect if AM_EXTRA_MAKEFLAGS=VERBOSE=1 was used with build scripts. - Don't write warnings about replication variables when doing bootstrap. - Fixed that mysql_cond_wait() and mysql_cond_timedwait() will report original source file in case of errors. - Ignore some compiler warnings BUILD/FINISH.sh: Detect if AM_EXTRA_MAKEFLAGS=VERBOSE=1 or --verbose was used BUILD/SETUP.sh: Added --verbose to print out the full compile lines Updated help message client/mysqltest.cc: Fixed that one can use 'replace' with cat_file cmake/configure.pl: If --verbose is used, get make to write out compile commands debian/dist/Debian/rules: Added $AM_EXTRA_MAKEFLAGS to get VERBOSE=1 on buildbot builds debian/dist/Ubuntu/rules: Added $AM_EXTRA_MAKEFLAGS to get VERBOSE=1 on buildbot builds include/my_pthread.h: Made set_timespec_time_nsec() more portable. include/mysql/psi/mysql_thread.h: Fixed that mysql_cond_wait() and mysql_cond_timedwait() will report original source file in case of errors. mysql-test/suite/innodb/r/auto_increment_dup.result: Fixed wrong DBUG_SYNC mysql-test/suite/innodb/t/auto_increment_dup.test: Fixed wrong DBUG_SYNC mysql-test/suite/perfschema/include/upgrade_check.inc: Make test more portable for changes in *.sql files mysql-test/suite/perfschema/r/pfs_upgrade.result: Updated test results mysql-test/valgrind.supp: Ignore running Aria checkpoint thread scripts/mysqlaccess.sh: Changed reference of bugs database Ensure that also client-server group is read. sql/handler.cc: Added missing syncpoint sql/mysqld.cc: Don't write warnings about replication variables when doing bootstrap sql/mysqld.h: Don't write warnings about replication variables when doing bootstrap sql/rpl_rli.cc: Don't write warnings about replication variables when doing bootstrap sql/sql_insert.cc: Don't mask SERVER_SHUTDOWN in insert_delayed This is done to be able to distingush between shutdown and interrupt errors support-files/compiler_warnings.supp: Ignore some compiler warnings in xtradb,innobase, oqgraph, yassl, string3.h
* Fixed problem with failing mysql_upgrade when proc table was not correct.Michael Widenius2013-01-112-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved out creation of performance schema tables from mysql_system_tables.sql as the performance_tables creation scripts needs a working mysql.proc to work. client/mysql_upgrade.c: Added option -V, --version debian/dist/Debian/mariadb-server-5.5.files: Added mysql_performance_tables.sql debian/dist/Ubuntu/mariadb-server-5.5.files: Added mysql_performance_tables.sql mysql-test/lib/v1/mysql-test-run.pl: Added mysql_performance_tables.sql mysql-test/mysql-test-run.pl: Added mysql_performance_tables.sql scripts/CMakeLists.txt: Moved out creation of performance schema tables from mysql_system_tables.sql as the performance_tables creation scripts needs a working mysql.proc to work scripts/mysql_install_db.sh: Added mysql_performance_tables.sql scripts/mysql_performance_tables.sql: Moved out creation of performance schema tables from mysql_system_tables.sql as the performance_tables creation scripts needs a working mysql.proc to work scripts/mysql_system_tables.sql: Move creation of performance schema tables to mysql_performance_tables.sql Added 'flush tables' to get things to work if someone deletes a table like mysql.proc before run scripts/mysql_system_tables_fix.sql: ove performance table things to mysql_performance_tables.sql storage/perfschema/pfs.cc: Fixed comment
* if the debian package name for 5.5.28 is 5.5.28-mariadb1~wheezySergei Golubchik2012-12-061-2/+2
| | | | | then for 5.5.28a it should be 5.5.28a-mariadb1~wheezy not 5.5.28-mariadb-a1~wheezy
* Fix the incorrect mergeSergei Golubchik2012-10-191-2/+2
|
* MDEV-519: mariadb-client-5.5 conflicts with package mytopunknown2012-10-081-1/+0
| | | | | | | | Do not include mytop in mariadb-client-5.5 .deb package. There is already a Debian mytop package, so we get a package conflict. And there is no reason for the MariaDB project to guerrilla-take-over mytop maintenance.
* Fixed installation issues on debian:Michael Widenius2012-10-022-3/+3
| | | | | | | | | | - Don't abort if plugin table exists - Use longer timeout for start/stop of mysqld debian/dist/Debian/mariadb-server-5.5.postinst: Don't abort if plugin table exists debian/mariadb-server-5.5.mysql.init: Use longer timeout for start/stop of mysqld
* MDEV-469 Debian/Ubuntu build dependencies for source package mariadb-5.5 ↵Sergei Golubchik2012-08-233-3/+10
| | | | | | does not includes "cmake" only add cmake as a build dependency for distributions, where cmake is recent enough
* MDEV-469 Debian/Ubuntu build dependencies for source package mariadb-5.5 ↵Sergei Golubchik2012-08-222-2/+2
| | | | does not includes "cmake"
* MDEV-286 mytop is not installed in 5.5Sergei Golubchik2012-08-131-0/+1
| | | | | include mytop in bintars, rpms, and debs. install mysqlbug.1 too.
* MDEV-393. Remove --loose-pbxt=OFF/loose-skip-pbxt from bootstrapper calls to ↵Vladislav Vaintroub2012-07-122-2/+2
| | | | avoid "unknown parameter" warning
* The variable "table_cache" is deprecated, use the new name ↵unknown2012-07-051-1/+1
| | | | | | "table_open_cache" instead. Thanks to Ivoz for pointing this out.
* MDEV-346: 5.5 upgrade test fails on precise.unknown2012-06-182-6/+8
| | | | | | Attempt to make it easier to upgrade mysql->mariadb on Ubuntu precise. It looks like we were missing conflicts: and replaces: on packages mysql-server-5.5 and mysql-client-5.5.
* client's option is default-character-set, server's is character-set-serverSergei Golubchik2012-06-071-1/+1
|
* MDEV-302 lp:988204 MariaDB 5.5.23 binaries don't use libaioSergei Golubchik2012-06-062-42/+4
| | | | | | simplify debian/dist/*/rules slightly. move hard-coded config value to cmake files. (the actual fix is -DBUILD_CONFIG=mysql_release)
* don't use deprecated options in the installed config filesSergei Golubchik2012-05-301-3/+3
|
* MDEV-257: wrong libmysqlclient.so symlink in package libmariadbclient-dev.unknown2012-05-071-2/+2
|
* MDEV-207 Install headers required to build external storage pluginsSergei Golubchik2012-05-051-2/+1
| | | | 5.5 version. for cmake, not autotools.
* lp:886550 Wrong installation path for some include files.unknown2012-04-032-4/+0
| | | | | | | Now install all includes in a flat hierarchy under $PREFIX/include/mysq/, same as 5.3. User can override with -DINSTALL_INCLUDEDIR
* MDEV-135: work-around a GCC bug seen on Debian 5 "lenny" 64-bit.unknown2012-02-061-1/+1
|
* Fix .deb install failure when PBXT is not built-in.unknown2012-01-313-3/+3
| | | | Fix egrep syntax error in .deb preinst.
* Add INFO_SRC and INFO_BIN to .deb packaging to fix a test failure inunknown2012-01-2831-36/+46
| | | | | file_contents.test. Also fix some old references to 5.3 in .deb packaging found while debugging this.
* Fix debian patches for mysql-test-run wrt. deleted test account.unknown2012-01-281-1/+2
|
* Revert some earlier changes to my.cnf and mariadb.cnf.unknown2012-01-272-19/+13
| | | | | | | | | 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.
* .deb packaging fixes: make mariadb-common a real package, which depends onunknown2012-01-268-50/+83
| | | | | | | 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.
* Add missing include and library files to libmariadbclient-dev package.unknown2012-01-253-2/+8
|
* More 5.5 .deb packaging fixesunknown2012-01-242-4/+2
|
* More small 5.5 .deb packaging fixes found in Buildbot tests.unknown2012-01-245-5/+6
|
* Fix two .deb problems causing build/install failures in Buildbot.unknown2012-01-243-6/+10
|
* Fix typo in Ubuntu .deb packagingunknown2012-01-231-1/+1
|
* Buildbot VMs have cmake in /usr/local/, so we need to include that in the path.unknown2012-01-232-2/+2
|