mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
175027 commits 2774 branches 343 tags 1.6 GiB
Commit graph

136 commits

Author SHA1 Message Date
Otto Kekäläinen
effbe7dd7b General spell fixing in comments and strings 2016-06-08 14:17:23 +03:00
Sergei Golubchik
a2bcee626d Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
Sergei Golubchik
1623995158 Merge branch '5.5' into 10.0 2015-12-13 00:10:40 +01:00
Nirbhay Choubey
33f0cf7119 MDEV-9227 : Both CentOS service names mysql and mariadb exist? 
As 10.1 has systemd support, there is no longer need to set
_SYSTEMCTL_SKIP_REDIRECT/SYSTEMD_NO_WRAP.
 2015-12-09 12:24:53 -05:00
Sergei Golubchik
d1fe928c4f MDEV-8607 Init script doesn't check all applicable configuration groups 
use --mysqld instead of naming all groups explicitly

https://github.com/MariaDB/server/pull/92
 2015-12-07 15:20:23 +01:00
Sergei Golubchik
7f19330c59 Merge branch 'github/10.0-galera' into 10.1 2015-11-19 17:48:36 +01:00
Sergei Golubchik
beded7d9c9 Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
Daniel Black
d8ecc2a011 MDEV-9007: systemd - service mariadb bootstrap 
Now this error out and refers to galera_new_cluster.
 2015-11-02 23:37:03 -05:00
Nirbhay Choubey
4d15112962 Merge tag 'mariadb-10.0.22' into 10.0-galera 2015-10-31 18:07:02 -04:00
Sergei Golubchik
d775ecdd01 MDEV-8543 mysql.server script not correctly handle --pid-file. 2015-10-28 13:13:45 +01:00
Sergey Vojtovich
6346d1de2f MDEV-427/MDEV-5713 Add systemd script with notify functionality 
After review/QA fixes.
 2015-10-12 17:51:49 +02:00
Nirbhay Choubey
4d33f9dca0 Merge branch '5.5-galera' into 10.0-galera 2015-09-25 14:57:56 -04:00
Nirbhay Choubey
fd1b2e486a MDEV-8803: Debian jessie 8.2 + MariaDB 10.1.7 + GaleraCluster 
* Merge fix for issue #127 from mysql-wsrep (commit : a0ba0d7)
* Also, cherry-picked a similar fix for OpenSUSE (commit : 7790cb1)
 2015-09-15 17:07:41 -04:00
Sergei Golubchik
2db62f686e Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
Nirbhay Choubey
860576f416 Merge branch '10.0' into 10.0-galera 
Merge branch 10.0 till revision:
f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0

Conflicts:
	.bzrignore
	storage/xtradb/CMakeLists.txt
 2015-02-18 18:07:45 -05:00
Nirbhay Choubey
3c9137deeb Merge branch '5.5' into 5.5-galera 
Merge banch 5.5 till revision :
fdd6c11 - MDEV-7419 Function cli_safe_read not exported

Conflicts:
	.bzrignore
	debian/dist/Debian/mariadb-galera-server-5.5.files.in
	debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
	storage/tokudb/CMakeLists.txt
	support-files/build-tags
 2015-02-18 17:15:57 -05:00
Sergei Golubchik
a34fd50ce1 MDEV-7478 log-basename unpredictable behavior in standalone mode 
* fix /etc/init.d/mysql to use log-basename for pid-filename
* fix mysqld_safe not to force logging-to-file when log-basename is specified
 2015-02-09 20:53:36 +01:00
Sergei Golubchik
8e7649867f Merge 10.0-galera into 10.1 2015-02-06 16:14:23 +01:00
Nirbhay Choubey
96e505e4b7 MDEV-7319 : Galera bootstrap (/etc/init.d/mysql bootstrap) 
returns code 0 on failure

Modified init script to return with proper exit status for
bootstrap command. [Based on Kenny Rasschaert's suggestion]
 2014-12-20 19:58:54 -05:00
Nirbhay Choubey
cb47155c68 MDEV-7319 : Galera bootstrap (/etc/init.d/mysql bootstrap) 
returns code 0 on failure

Modified init script to return with proper exit status for
bootstrap command. [Based on Kenny Rasschaert's suggestion]
 2014-12-20 19:49:04 -05:00
Sergei Golubchik
f62c12b405 Merge 10.0.14 into 10.1 2014-10-15 12:59:13 +02:00
Sergei Golubchik
3620910eea cleanup: galera merge, simple changes 2014-10-01 23:38:27 +02:00
Nirbhay Choubey
236cc6cd49 wsrep-related changes: removed some unnecessary files & minor modifications. 2014-09-25 20:59:15 -04: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
857abf1481 bzr merge -r4104..4120 codership/5.6/ 2014-08-12 14:05:44 -04:00
Nirbhay Choubey
8358dd53b7 bzr merge -r4346 maria/10.0 (maria-10.0.13) 2014-08-11 23:55:41 -04:00
Nirbhay Choubey
4788577c20 bzr merge -r3997..4010 codership-mysql/5.5 2014-08-06 15:45:53 -04:00
Nirbhay Choubey
ec91eea8db Local merge of mariadb-5.5.39 
bzr merge -r4264 maria/5.5

Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.
 2014-08-06 14:06:11 -04:00
Sergei Golubchik
1987819281 MDEV-6428 [PATCH] MariaDB start script doesn't realize failure of MariaDB startup 
abort the wait loop if mysqld_safe is not running
 2014-07-26 23:08:38 +02:00
Nirbhay Choubey
086af8367e bzr merge -r4209 maria/10.0. 2014-05-21 11:09:55 -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
Sergei Golubchik
81e6327e49 MDEV-5068 import file from init script 2014-04-10 10:34:28 +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
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
Sergei Golubchik
9950c5c7ba MDEV-5892 Centos startup script is broken 
Don't try to be smart about --socket.
Assume that if user has set up a non-standard location for a socket,
she did it consistently for both a server and clients
(otherwise most clients won't work anyway).
 2014-03-19 10:02:41 +01:00
Nirbhay Choubey
87910f7d30 MDEV#5759 Init script contains syntax error 
Fixed the init script.
 2014-02-27 17:56:28 -05:00
Nirbhay Choubey
ae6e1548cb Merge from maria/5.5 (-rtag:mariadb-5.5.36). 2014-02-25 17:49:41 -05:00
Sergei Golubchik
b1966435c2 MDEV-5580 /etc/init.d/mysql exits too early 
Wait until the server starts accepting connections, not until the pid file appears
 2014-02-17 11:10:30 +01:00
Nirbhay Choubey
4a6be51f78 * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera. 
* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.
 2014-01-30 12:45:38 -05:00
Nirbhay Choubey
31eaa90a6e Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
Nirbhay Choubey
8acebe6d63 MDEV#5384: Update init script in MariaDB Cluster 
Reduced the sleep time to 10secs.
 2013-12-05 10:59:18 -05:00
Seppo Jaakola
255e20a175 Merged revisions 3418..3424 from mariadb-galera-5.5 2013-10-07 08:57:23 +03:00
Jan Lindström
ac5d1d761a Merged revisions 3916--3921 from lp:~codership/codership-mysql/5.5-23 
------------------------------------------------------------
revno: 3921
fixes bug: https://launchpad.net/bugs/1228149
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23
timestamp: Mon 2013-09-23 18:29:42 +0300
message:
  References lp:1228149 - fixing typos.
------------------------------------------------------------
revno: 3920
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Fri 2013-09-20 15:43:18 +0400
message:
  References lp:1201893 - remove setenv("WSREP_LOG_DIR") from ha_innodb.cc
------------------------------------------------------------
revno: 3919
tags: wsrep_23.7.6
fixes bug: https://launchpad.net/bugs/1087368
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23
timestamp: Thu 2013-09-19 06:00:43 +0300
message:
  References lp:1087368 - fix to preserve the order of options in case --wsrep-new-cluster is i
n the middle of option list
------------------------------------------------------------
revno: 3918
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23\ 
timestamp: Wed 2013-09-18 23:22:55 +0300
message:
  bumped wsrep patch version number to 7.6
------------------------------------------------------------
revno: 3917
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Wed 2013-09-18 20:11:39 +0400
message:
  References lp:1218944 - wsrep_sst_rsync now recognizes log_group_home_dir
------------------------------------------------------------
revno: 3916
fixes bug: https://launchpad.net/bugs/1224775
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-09-15 21:29:57 +0300
message:
  References lp:1224775 - reworked wsrep_recover to create temporary log file in $DATADIR. Plus
 cleaned up that function slightly.
 2013-09-26 17:51:01 +03: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
Sergei Golubchik
005c7e5421 mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
Seppo Jaakola
527ce30cf3 References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3874..3878 2013-06-15 16:15:45 +03:00
Nirbhay Choubey
b350990a11 local merge. 2013-04-09 14:03:35 +05:30
Nirbhay Choubey
4ad004c2b4 Backporting patch for bug#15852074. 2013-04-09 14:00:05 +05:30
Sergei Golubchik
65ca700def merge. 
checkpoint.
does not compile.
 2010-11-25 18:17:28 +01:00
Jonathan Perkin
ed02cca13a Fix previous merge: 'kill -0' (check PID exists) was changed to 'kill -9', 
meaning a '/etc/init.d/mysql stop' would actually cause mysqld_safe to
relaunch mysqld rather than shut it down.
 2009-12-16 10:27:56 +00:00