database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00
Code Activity
176,318 Commits 3,148 Branches 363 Tags
eda2ebefba43bde1b1881688576e865f9ba9617c
Commit Graph

234 Commits

Author SHA1 Message Date
Sergei Golubchik
2195bb4e41 Merge branch '10.1' into 10.2 2017-02-10 17:01:45 +01:00
Vicențiu Ciorbaru
8e15768731 Merge branch '10.0' into 10.1 2017-01-16 03:18:14 +02:00
vicentiu
e9aed131ea Merge remote-tracking branch 'origin/5.5' into 10.0 2017-01-06 17:09:59 +02:00
Sergei Golubchik
4a5d25c338 Merge branch '10.1' into 10.2 2016-12-29 13:23:18 +01:00
Sergei Golubchik
8fcdd6b0ec Numerous issues in mysqld_safe 2016-12-22 12:25:10 +01:00
Sergei Golubchik
2ede40e67e Merge branch '10.0' into 10.1 2016-09-29 12:59:51 +02:00
Sergei Golubchik
a3f11f7549 Merge branch '5.5' into 10.0 2016-09-29 12:31:46 +02:00
Sergei Golubchik
7497ebf8a4 mysqld_safe: close stdout and stderr 
when they're not needed anymore. Helps when
daemonizing it from mysql.init
 2016-09-29 10:16:24 +02:00
Sergei Golubchik
66d9696596 Merge branch '10.0' into 10.1 2016-09-28 17:55:28 +02:00
Sergei Golubchik
77ce4ead81 Merge branch '5.5' into 10.0 2016-09-27 09:21:19 +02:00
Sergei Golubchik
7ae555c114 Merge branch 'mysql/5.5' into 5.5 
80% reverted
 2016-09-11 20:51:09 +02:00
Terje Rosten
684a165f28 Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFE 
Argument to malloc-lib must be included in restricted list of
directories, symlink guards added, and mysqld and mysqld-version
options restricted to command line only. Don't redirect errors to
stderr.
 2016-08-25 13:32:25 +05:30
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