mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-28 17:54:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
201283 commits 2783 branches 343 tags 1.7 GiB
Commit graph

1341 commits

Author SHA1 Message Date
Sergei Golubchik
7e29c1b539 5.5 merge 2014-09-16 14:03:17 +02:00
Sergei Golubchik
f18b1400d1 debian: require jemalloc >= 3.0.0, because 2.2.5 (on precise) crashes 2014-09-15 18:55:17 +02:00
Sergei Golubchik
3d94523638 MDEV-6613 build system endianness test fails for ppc64le (i.e. Ubuntu) 
* remove bundled jemalloc, use the system one
* force jemalloc in release builds on linux
 2014-09-12 08:41:16 +02:00
Jan Lindström
df4dd593f2 MDEV-6247: Merge 10.0-galera to 10.1. 
Merged lp:maria/maria-10.0-galera up to revision 3879.

Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
 2014-08-26 15:43:46 +03:00
Nirbhay Choubey
746c755d42 MDEV-6495: local merge from maria-5.5-galera. 2014-08-05 19:00:54 -04:00
Nirbhay Choubey
e4e55f7968 MDEV-6495: innodb_flush_log_at_trx_commit=0 as suggestion 
for galera vs =2

Updated innodb_flush_log_at_trx_commit value in cnfs as per
recommendation.
 2014-08-05 18:55:05 -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
Nirbhay Choubey
0dadd01750 MDEV-3896: More user-friendly cnf files in MariaDB-Galera rpm/deb 
packages

* Added "galera" as default option group.
* Updated deb/rpm server config files to include mandatory
  and optional settings (as comments) required to configure
  Galera cluster.
 2014-07-17 16:22:01 -04:00
Nirbhay Choubey
abbdc7ae86 MDEV-6118: Unable to install "MariaDB-connect-engine" when 
using "MariaDB-Galera-server"

rpm: Updated components' requires-list to include "MariaDB"
     instead of "MariaDB-server".

deb: Added (ORed) 'mariadb-galera-server-10.0' to the 'Depends'
     list of connect and oqgraph engine packages.
 2014-08-06 19:31:13 -04:00
Nirbhay Choubey
a76a6601ec bzr merge -rtag:mariadb-10.0.12 maria/10.0 2014-06-19 13:12:38 -04:00
Sergei Golubchik
f61f36b386 Merge branch '10.0' into 10.1 
Conflicts:
	CMakeLists.txt
	VERSION
Modified:
	.gitignore
 2014-06-13 16:10:25 +02:00
Nirbhay Choubey
b441c510a7 bzr merge -rtag:mariadb-5.5.38 maria/5.5 2014-06-10 16:04:26 -04:00
Nirbhay Choubey
2357871a21 Fix for a debian build failure (cherry-picked 
from 10.0:r4231).
 2014-06-09 16:13:30 -04:00
Sergei Golubchik
e27c338634 5.5.38 merge 2014-06-06 00:07:27 +02:00
Nirbhay Choubey
6fc646ef2f Fixed a typo in debian control file. 2014-06-02 08:26:42 -04:00
Sergei Golubchik
759fa19690 don't install ndb related .ini files, remove mysql_fix_privilege_tables.1 and mysqlman.1 2014-06-01 11:23:20 +02: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
Nirbhay Choubey
26fa9e8294 Added rsync to galera server's debian/rpm dependency list. 2014-05-29 21:03:10 -04:00
Nirbhay Choubey
707f378a13 Added rsync to galera server's debian dependency list. 2014-05-29 15:39:29 -04:00
Nirbhay Choubey
7487f6b397 Removing rsync from the debian build dependency list. 2014-05-27 09:07:19 -04:00
Nirbhay Choubey
ef7e173404 Removing rsync from the debian build dependency list. 2014-05-27 09:06:04 -04:00
Sergei Golubchik
eef1201bcc set version to 10.1.0 2014-05-25 17:17:50 +02:00
Nirbhay Choubey
86e73576dd Setting the "Standards-Version" in Debian control file 
back to 3.8.3.
 2014-05-25 00:23:17 -04:00
Nirbhay Choubey
bd5ca5e609 MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' is 
not in the dependency list

Added socat, grep, gawk, iproute, coreutils, findutils to the
dependency list.
 2014-05-25 00:18:26 -04:00
Nirbhay Choubey
0f10b12b1c MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' is 
not in the dependency list

Added socat, grep, gawk, iproute, coreutils, findutils to the
dependency list.
 2014-05-25 00:07:25 -04:00
Nirbhay Choubey
ab4947463e Merging changes from maria-5.5-galera and 
some test fixes.

bzr merge -r3479..3493 maria-5.5-galera
 2014-05-22 18:31:04 -04:00
Nirbhay Choubey
086af8367e bzr merge -r4209 maria/10.0. 2014-05-21 11:09:55 -04:00
Nirbhay Choubey
50d1e45cd4 MDEV#5925: New mariadb-galera-test packages 
Added logic for generation of 'galera' test
packages.
 2014-05-12 12:45:02 -04:00
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02:00
Sergei Golubchik
a5beb350ae MDEV-5454 Dependencies for mariadb-connect-engine-10.0.deb don't look correct 2014-05-04 17:37:54 +02:00
Nirbhay Choubey
68a0f28def MDEV-6204: wsrep_sst_rsync timeout when lsof is not installed 
* Added a check for lsof
* Added rsync & lsof to debian dependency list.
* Merged r3982 from codership-mysql/wsrep-5.5.
 2014-05-03 09:18:11 -04:00
Nirbhay Choubey
bdeb847e9b MDEV-6192 [Warning] Failed to load slave replication state from 
table mysql.gtid_slave_pos: 1286: Unknown storage engine 'InnoDB'

Removed 'loose-innodb' option from mysqld booststrap command
in debian post-installation script.
 2014-04-30 15:40:00 -04:00
Nirbhay Choubey
29466e2c85 * Adding wsrep_sst_xtrabackup-v2 to deb server 
files
* Updated .bzrignore
 2014-04-25 18:23:14 -04:00
Jan Lindström
150e88e8c9 Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. 2014-04-16 12:13:43 +03:00
Nirbhay Choubey
eec6222a89 Adding wsrep_sst_xtrabackup-v2 to the list of files 
in mariadb-galera-server package.
 2014-04-15 22:31:08 -04:00
Sergei Golubchik
2eaaeaeaa2 MDEV-5625 Debian package mariadb-client-5.5 lacks dependency on libterm-readkey-perl 2014-04-10 13:10:33 +02:00
Nirbhay Choubey
4213263101 Merging mariadb-10.0.10. 
* bzr merge -rtag:mariadb-10.0.10 maria/10.0.
 2014-04-08 10:36:34 -04:00
Sergei Golubchik
e82a82eef8 MDEV-6022 Patch 44_scripts__mysql_config__libs.dpatch is inapplicable, deb package creation fails 2014-04-07 20:52:04 +02:00
Nirbhay Choubey
90e4f7f9d3 * bzr merge -rtag:mariadb-10.0.9 maria/10.0 
* Fix for post-merge build failures.
 2014-03-26 14:27:24 -04:00
Nirbhay Choubey
586fab72f0 Merging deb/rpm script changes from maria-5.5-galera. 2014-03-24 16:40:24 -04:00
Nirbhay Choubey
4154f3aa05 Modified debian scripts to make galera packages 
self-contained.
 2014-03-14 17:54:53 -04:00
Nirbhay Choubey
8a99be643c Modified debian scripts to make galera packages 
self-contained.
 2014-03-14 17:52:55 -04:00
Nirbhay Choubey
ff0f41974c Debian script fixes. 2014-03-13 11:56:37 -04:00
Nirbhay Choubey
d395440d0f Debian script fixes. 2014-03-13 11:51:31 -04:00
Michael Widenius
e63c03db8d Merge with 10.0-base 
Automatic merge, except for server_audit.cc that had to be modified slightly
Changes to xtradb and innobase where ignored was these made no sence for 10.0
 2014-03-13 16:43:11 +02:00
Michael Widenius
1727849659 Merge with 5.5 2014-03-11 17:49:09 +02:00
Sergei Golubchik
5b7cab8219 default xtradb - fixes for debian packaging 2014-03-08 12:33:51 +01:00
Alexey Botchkov
7449c7d32b MDEV-5756 Add Audit Plugin to Debian packaging. 2014-02-28 00:41:08 +04:00
Sergei Golubchik
05aba79e98 MDEV-4447 MariaDB sources should have unix-style line endings everywhere 2014-02-27 12:00:16 +01:00
Nirbhay Choubey
6e3fc511c4 MDEV #5682 : Incompatible galera / mariadb-galera-server 
version on Debian

Updated galera package version to >=25.2 in Debian/Ubuntu
control files.
 2014-02-20 13:49:50 -05:00