summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
Commit message (Expand)AuthorAgeFilesLines
* This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-4/+4
* Temporary solution: skip PBXT (like we do e.g. for --skip-innodb) in embedded Sergey Petrunya2009-10-021-0/+16
* After-merge fix for MySQL 5.1.38 merge into MariaDB.unknown2009-09-111-5/+5
* Merge MySQL->MariaDBSergey Petrunya2009-09-081-135/+206
|\
| * Bug#19027 MySQL 5.0 starts even with Fatal InnoDB errorsKristofer Pettersson2009-05-181-1/+1
| * Bug#19027 MySQL 5.0 starts even with Fatal InnoDB errorsKristofer Pettersson2009-05-141-137/+209
* | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-12/+23
|\ \ | |/
| * Manual merge of patch for bug #40552 into the team tree.Alexey Kopytov2009-03-161-1/+1
| |\
| * | Bug#42610 Dynamic plugin broken in 5.1.31Sergey Glukhov2009-03-131-12/+23
| |/
* | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-0/+3
|\ \
| * \ merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-0/+3
| |\ \ | | |/
| | * Bug#42610 Dynamic plugin broken in 5.1.31Sergey Glukhov2009-02-091-0/+3
| * | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-19/+21
| |\ \ | | |/
* | | Merge with base MySQL 5.1Michael Widenius2009-02-151-20/+22
|\ \ \ | | |/ | |/|
| * | Bug#29263 disabled storage engines omitted in SHOW ENGINESSergey Glukhov2008-12-171-19/+21
* | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-2/+3
| |/ |/|
* | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-4/+4
|\ \ | |/
| * Bug#36768 (partition_info::check_partition_info() reports mal formedMarc Alff2008-10-061-4/+4
* | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-6/+22
|\ \ | |/
| * Bug#35807 - INSTALL PLUGIN replicates row-based, but not stmt-basedSven Sandberg2008-08-191-1/+16
| * Merge fix for BUG#35478 into 5.1Sergey Petrunia2008-07-151-1/+1
| * Fix for bug#37669: Server crash by setting "@@session.innodb_table_locks"Ramil Kalimullin2008-07-091-2/+2
| * Bug#37069: Make federated disabled by defaultGeorgi Kodinov2008-05-301-2/+3
* | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-52/+54
|\ \ | |/
| * fixed compiler error in 5.1-marvel.unknown2008-03-281-1/+0
| * fixed a hand in 5.1-marvel : unknown2008-03-281-5/+0
| * Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-281-0/+1
| |\
| | * Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-131-30/+8
| | |\
| | * \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-271-0/+3
| | |\ \
| | | * \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-121-1/+1
| | | |\ \
| | | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-081-0/+3
| | | |\ \ \
| | | | * | | Mutex protection added for loading plugins. (BUG#33345)unknown2007-12-191-0/+3
| * | | | | | Manual mergeunknown2008-03-141-30/+8
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge kaamos.(none):/data/src/mysql-5.1unknown2008-03-121-30/+8
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2008-02-241-31/+8
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Bug#32757: hang with sql_mode set when setting some global variablesunknown2008-02-241-31/+8
| | | | |/ /
| * | | | | Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/...unknown2008-03-071-36/+91
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge xiphis.org:/anubis/antony/work/p1-bug34598.2unknown2008-02-191-15/+41
| | |\ \ \ \
| | * \ \ \ \ Merge stella.local:/home2/mydev/mysql-5.1-amainunknown2008-02-141-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | fixes to make pushbuild tests greenunknown2008-01-261-3/+2
| | * | | | | Bug#33358unknown2008-01-251-18/+48
| | | |_|/ / | | |/| | |
| * | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-02-181-4/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | A fix and a test case for Bug#34166 Server crash in SHOW OPEN TABLES andunknown2008-01-301-1/+1
| | |/ / / | |/| | |
* | | | | Merge xiphis.org:/anubis/antony/work/p1-bug34598.2unknown2008-02-191-15/+41
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bug#34598unknown2008-02-191-15/+41
| |/ / /
* | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gcaunknown2008-02-181-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>unknown2008-02-181-4/+3
| |/ /
* | | Fixed compiler warnings in a lot of filesunknown2008-02-131-1/+1
* | | Fixes to merge.unknown2007-12-201-1/+0
* | | Merge jani@marvel:/my/bk/mysql-maria.newunknown2007-12-181-1/+1
|\ \ \ | |/ / |/| |