Commit graph

671 commits

Author SHA1 Message Date
Jan Lindström
ea6f92662c MDEV-5430: Debian MariaDB-Galera packages do not get built in buildbot [Part 4]
Missed one file name change.
2013-12-11 10:45:49 +02:00
Jan Lindström
92a15782f9 MDEV-5428: Debian MariaDB-Galera packages do not get built in buildbot [Part 3]
Missed one lintian rule.
2013-12-11 09:38:21 +02:00
Jan Lindström
3ad45220bc Additional name fixes. 2013-12-10 17:45:02 +02:00
Sergei Golubchik
b2c56742b5 restore debian/dist/Ubuntu/control that was changed by mistake 2013-12-12 17:02:13 +01:00
Jan Lindström
170c3c2b21 MDEV-5423: Debian MariaDB-Galera packages do not get built in buildbot [Part 2]
Fix: Server name is mariadb-galera-5.5
2013-12-10 10:34:41 +02:00
Sergei Golubchik
cec76b3861 correct old assert in add_role_user_mapping_action to match changed function prototypes.
fix the element deleting logic for roles_mappings_hash
2013-12-09 12:39:31 +01:00
Jan Lindström
3df2aa9458 MDEV-5385: Debian MariaDB-Galera packages do not get built in buildbot
Analysis: File names were incorrect for distribution files.

Fix: Fixed file names to be same as in 5.5.
2013-12-05 19:22:00 +02:00
Jan Lindström
329fb58656 MDEV-5385: Debian MariaDB-Galera packages do not get built in buildbot
Added missing .in files and updated CMakeLists.txt to contain galera
specific files.
2013-12-04 18:49:40 +02:00
Seppo Jaakola
496e22cf3b merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
and a number of fixes to make this buildable. 
Run also few short multi-master high conflict rate tests, with no issues
2013-12-04 10:32:43 +02:00
Jan Lindström
071edcfea0 Merge with MariaDB 5.5.34. 2013-11-25 17:14:08 +02:00
Sergei Golubchik
ed910b62e9 remove unused libevent (that was merged from 5.6 by mistake) 2013-11-21 15:05:25 +01:00
Sergei Golubchik
26f56089c7 add missing plugins to deb packages 2013-11-14 19:56:55 +01:00
Sergei Golubchik
4157185f24 10.0-base merge 2013-11-13 23:03:48 +01:00
Sergei Golubchik
bdd883ed9a 5.5. merge 2013-11-13 14:07:58 +01:00
Sergei Golubchik
3d57c343e5 MDEV-5038 put tokudb into the server package 2013-11-11 09:30:35 +01:00
Sergei Golubchik
ab2bf1ad0b merge with 10.0.5 2013-11-09 11:05:51 +01:00
Sergei Golubchik
af22c45ec7 mariadb-tokudb-engine-10.0.deb 2013-11-09 11:04:54 +01:00
Sergei Golubchik
80112232d1 misc fixes for buildbot 2013-11-07 14:30:21 +01:00
Sergei Golubchik
f0e06e31ff 10.0 version of MDEV-5254 2013-11-07 13:39:46 +01:00
Sergei Golubchik
0fdb3bcfdb 10.0-base merge (roles) 2013-10-29 15:08:44 +01:00
Sergei Golubchik
779693f409 fixes for builbot 1 2013-10-20 16:39:51 -07:00
Jan Lindström
decd08408b Fix merge error. 2013-09-27 17:07:44 +03:00
Jan Lindström
6a65223193 mariadb-5.5.33a merge 2013-09-27 13:48:58 +03:00
Sergei Golubchik
181b13d926 simplify CMakeLists.txt for cassandra/connect engines
now, if the dynamic plugin puts itself in a distinct component, then
* ${plugin}.cnf file is generated and installed automatically
* a separate RPM is generated automatically
* necessary FILELIST/PROVIDES/OBSOLETES/REQUIRES are filled in automatically
2013-09-25 19:32:14 +02:00
Sergei Golubchik
aaa3ec4aca fix debian packaging (again).
we don't build innodb plugin in 10.0 yet
2013-09-21 20:23:51 +02:00
Sergei Golubchik
2fe0836eed 5.5.33a merge 2013-09-20 11:29:01 +02:00
Sergei Golubchik
9af177042e 10.0-base merge.
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
2013-09-21 10:14:42 +02:00
Sergei Golubchik
93b7d00f00 MDEV-5035 debian package conflict libmariadbclient18 5.5.33+maria-1~wheezy vs. mariadb-server-5.3 5.3.12-mariadb122~wheezy 2013-09-19 20:19:17 +02:00
Sergei Golubchik
427daab74f fix broken (after merge) galera deb packaging 2013-09-18 20:55:58 +02:00
Sergei Golubchik
4ec2e9d7ed 5.5 merge and fixes for compiler/test errors 2013-09-18 13:07:31 +02:00
Sergei Golubchik
909775a762 mariadb-5.5.33 merge 2013-09-18 12:00:23 +02:00
Sergei Golubchik
197bdbae4d fix upgrades when mariadb-galera-server-5.5 is installed 2013-09-18 10:30:23 +02:00
Sergei Golubchik
69324831a4 mariadb-tokudb-engine deb package is not architecture-independent 2013-09-17 17:07:45 +02:00
Sergei Golubchik
6d06ccbe53 specify deb conflicts correctly 2013-09-16 21:21:15 +02:00
Sergei Golubchik
265bbf5fe1 introduce sysconf2dir, install tokudb.conf there, both in rpm and deb 2013-09-10 22:59:18 +02:00
Sergei Golubchik
3de5613445 INSTALL_DOCUMENTATION function for CMakeLists.txt
It puts files in the correct location for rpm/deb packages.
2013-09-10 22:53:44 +02:00
Sergei Golubchik
588a1d652f * mariadb-tokudb-engine-5.5.deb
* 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
2013-09-10 10:30:07 +02:00
Jan Lindström
ba3ff50ab2 Merge 10.0 to galera-10.0 2013-09-03 17:50:36 +03:00
Sergei Golubchik
6755944d08 remove PBXT 2013-08-30 11:25:49 +02:00
Seppo Jaakola
4222b2520b Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 2013-08-21 16:34:31 +03:00
Sergey Vojtovich
e084a2b043 MDEV-4786 - merge 10.0-monty - 10.0
Fixed debian/ubuntu packages build failure.

debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch:
  tmp_user has now extra column, updated patch accordingly.
2013-07-25 13:42:06 +04:00
Sergei Golubchik
5f6380adde 10.0-base merge 2013-07-18 16:46:57 +02:00
Sergei Golubchik
97e640b9ae 5.5 merge 2013-07-17 21:24:29 +02:00
Seppo Jaakola
db0cfba638 Merged with lp:maria revision #3766 2013-07-13 13:30:03 +03:00
Seppo Jaakola
0a9216835f Initial merge result with mariaDB 10: lp:maria 2013-07-13 13:01:13 +03:00
Sergey Vojtovich
0b116de7c5 MDEV-4438 - Spider storage engine 2013-06-27 15:18:48 +04:00
Alexey Botchkov
3fa8559deb MDEV-4656 MariaDB-Galera deb packages cannot be built, expected files are missing.
Kristian changed the install directory for these files to share/mysql.
(that was changeset 3334.1.345 Fix wrong install location for DEB supportfiles.)
But dist/mariadb-galera-server.files weren't changed accordingly.
Here we fix them.
2013-06-14 22:01:18 +05:00
Sergei Golubchik
5dee28b1c8 MDEV-703 LP:870310 - killall -9 in init-script 2013-06-13 14:32:57 +02:00
Sergei Golubchik
c40b7694d0 MDEV-4509 mysql init script should accept arguments
fix the init script for .deb packages
(rpm's were fine already)
2013-06-12 20:38:22 +02:00
Alexey Botchkov
7e0db6be56 MDEV-4600 mariadb-galera-server-5.5 on ubuntu has no dependency to galera while debian has.
dependency on galera added to the Ubuntu packaging script.
2013-06-12 17:07:48 +05:00