summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | MDEV-4222: Assertion `( ((global_system_variables.wsrep_on) &&Nirbhay Choubey2013-11-291-2/+2
| * | | | | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-31/+86
| |\ \ \ \ \ \
| * | | | | | | Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23.Jan Lindström2013-11-251-2/+2
| * | | | | | | MDEV-3895 Version naming for MariaDB-Galera buildsNirbhay Choubey2013-11-221-1/+4
| * | | | | | | Merge revisions 3907--3914 from lp:~codership/codership-mysql/5.5-23Jan Lindström2013-09-261-2/+6
| * | | | | | | mariadb-5.5.33 mergeSergei Golubchik2013-09-181-1/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-1/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-39/+51
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.30Seppo Jaakola2013-05-241-18/+30
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | References: Seppo Jaakola2013-02-261-7/+8
| * | | | | | | | | | | References https://mariadb.atlassian.net/browse/MDEV-4136Seppo Jaakola2013-02-151-2/+24
| * | | | | | | | | | | References lp:1115708 - merged with wsrep branch, revision 3845Seppo Jaakola2013-02-051-0/+9
| * | | | | | | | | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-22/+19
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ merging.Alexey Botchkov2012-12-131-47/+57
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | References: lp:1066784 - Merged revisions 3810-3827 from lp:codership-mysqlSeppo Jaakola2012-11-281-47/+57
| * | | | | | | | | | | | | MDEV-507 deb/rpm packages for galera builds.Alexey Botchkov2012-11-271-1/+1
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)Seppo Jaakola2012-10-241-16/+50
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | References lp:1052668 - DBUG macro issue in start_wsrep_THDSeppo Jaakola2012-09-191-6/+5
| * | | | | | | | | | | | | References lp:1051808 - merged with lp:maria/5.5Seppo Jaakola2012-09-171-19/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | References lp:1051808 - merged with lp:codership-mysql 5.5.27 based trunkSeppo Jaakola2012-09-171-0/+49
| * | | | | | | | | | | | | | Merged in change sets 3772-3779 from lp:codership-mysql/5.5mariadb-galera-5.5.25Seppo Jaakola2012-08-301-1/+1
| * | | | | | | | | | | | | | References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-16/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ references lp:1011983Seppo Jaakola2012-06-121-10/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | References lp:1011983Seppo Jaakola2012-06-121-2/+21
| * | | | | | | | | | | | | | | | Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5Seppo Jaakola2012-04-261-122/+167
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. Seppo Jaakola2012-04-131-5/+671