summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2015-12-291-28/+38
|\
| * Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-12-231-8/+8
| |\
| | * Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-12-221-8/+8
| | |\
| | | * MDEV-9290 : InnoDB: Assertion failure in file trx0sys.cc line 353mariadb-galera-5.5.47Nirbhay Choubey2015-12-221-8/+8
| * | | MDEV-9095 - [PATCH] systemd capability for --memlockSergey Vojtovich2015-12-221-10/+18
| * | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-221-0/+10
| |\ \ \ | | |/ /
| | * | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-12-191-1/+11
| | |\ \ | | | |/
| | | * MDEV-9290 : InnoDB: Assertion failure in file trx0sys.cc line 353Nirbhay Choubey2015-12-161-1/+11
| | | * Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-101-12/+2
| | | |\
| | | * \ Merge tag 'mariadb-5.5.46' into 5.5-galeraNirbhay Choubey2015-10-131-6/+17
| | | |\ \
| | * | \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-30/+32
| | |\ \ \ \
| | * \ \ \ \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-5/+23
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-09-251-13/+58
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | MDEV-8208: Sporadic SEGFAULT on startupNirbhay Choubey2015-09-251-1/+11
| | | * | | | | MDEV-8208: Sporadic SEGFAULT on startupNirbhay Choubey2015-09-161-18/+48
| | * | | | | | Avoid caching wsrep threads (fixed the erroneous condition).Nirbhay Choubey2015-09-141-1/+1
| | * | | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-08-251-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fix for a typo.Nirbhay Choubey2015-08-181-2/+2
| | | * | | | | Merge tag 'mariadb-5.5.45' into 5.5-galeraNirbhay Choubey2015-08-071-1/+10
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-081-2/+0
| | |\ \ \ \ \ \ \
| | * | | | | | | | MDEV-7631 : Invalid WSREP_SST rows appear in mysqld-bin.index fileNirbhay Choubey2015-06-241-1/+8
| | * | | | | | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-4/+8
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-06-021-2/+5
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | MDEV-8208 : Sporadic SEGFAULT on startupNirbhay Choubey2015-05-241-0/+6
| | | * | | | | | | | Merge tag 'mariadb-5.5.43' into 5.5-galeraNirbhay Choubey2015-05-041-15/+8
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-091-36/+51
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | refs #6 fixed compilation errors with -DWITH_DEBUG=1, removed unwanted filesTeemu Ollakka2015-05-081-0/+2
| | * | | | | | | | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-03-281-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | MDEV-7798: mysql.server init script can't stop mysqld when WSREP is turned offNirbhay Choubey2015-03-241-1/+2
| | | * | | | | | | | | | cleanup: remove unused THD::COND_wsrep_thdNirbhay Choubey2015-02-191-2/+1
| | | * | | | | | | | | | MDEV-6924 : Server crashed on CREATE TABLE ... SELECTNirbhay Choubey2014-11-171-0/+9
| | | * | | | | | | | | | bzr merge -r4015..4026 codership/5.5Nirbhay Choubey2014-10-091-0/+25
| | | * | | | | | | | | | bzr merge -rtag:mariadb-5.5.40 maria/5.5Nirbhay Choubey2014-10-091-4/+10
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | MDEV-6699 : wsrep_node_name not automatically set to hostnameNirbhay Choubey2014-09-091-7/+0
| | | * | | | | | | | | | | MDEV-6659: mysqld --help --verbose initializes wsrepNirbhay Choubey2014-08-281-1/+1
| | | * | | | | | | | | | | Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-061-15/+7
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | MDEV#6411 - Setting set @@global_wsrep_sst_auth=NULLNirbhay Choubey2014-07-091-2/+2
| | | * | | | | | | | | | | | Modified patch for lp:1310875.Nirbhay Choubey2014-06-111-1/+5
| | | * | | | | | | | | | | | bzr merge -r3985..3997 codership/5.5Nirbhay Choubey2014-06-101-1/+2
| | | * | | | | | | | | | | | MDEV#6206: wsrep_slave_threads subtracts from max_connectionsNirbhay Choubey2014-05-081-7/+14
| | | * | | | | | | | | | | | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-11/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | MDEV#5812 Memory leaks while running mysqld inNirbhay Choubey2014-03-111-0/+4
| | | * | | | | | | | | | | | | MDEV#5687: Maria doesn't shutdown following upgrademariadb-galera-5.5.36Nirbhay Choubey2014-03-061-3/+1
| | | * | | | | | | | | | | | | * Merged revisions 3945, 3946..3950, 3951..3961Nirbhay Choubey2014-02-281-2/+2
| | | * | | | | | | | | | | | | Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-02-251-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Merging revisions 3934..3944 from codership-mysql/5.5.Nirbhay Choubey2014-02-031-43/+14
| | | * | | | | | | | | | | | | | Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-291-1/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-57/+44
| | | * | | | | | | | | | | | | | | * Updated auto_increment_xxx_func.result to reflect the changesNirbhay Choubey2013-12-101-0/+2
| | | * | | | | | | | | | | | | | | MDEV#4109: Galera: Valgrind warnings "blocks are stillNirbhay Choubey2013-11-291-1/+2
View Lorry Controller Status