summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* 10.0-monty mergeSergei Golubchik2013-07-213-8/+9
|\
| * Applied all changes from Igor and SanjaMichael Widenius2013-06-153-7/+8
| * Push a lot of small fixes to get larger parts to compileMichael Widenius2013-05-211-1/+1
* | 10.0-base mergeSergei Golubchik2013-07-181-1/+1
|\ \
| * \ 5.5 mergeSergei Golubchik2013-07-171-1/+1
| |\ \
| | * \ mysql-5.5.32 mergeSergei Golubchik2013-07-161-1/+1
| | |\ \
| | | * | Correcting the permissions of the executable files.Murthy Narkedimilli2013-03-201-0/+0
| | | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191-1/+1
* | | | | Building libmysqld fixed.unknown2013-07-161-0/+1
* | | | | 10.0-base mergeSergei Golubchik2013-06-061-7/+6
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 mergeSergei Golubchik2013-06-061-7/+6
| |\ \ \ \ | | |/ / /
| | * | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)Sergei Golubchik2013-04-171-7/+6
* | | | | Merge 10.0-base -> 10.0Igor Babaev2013-04-171-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Makeing rpl_filter for each Master_info.Lixun Peng2013-04-161-1/+1
* | | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-26: Global transaction ID. First alpha release.unknown2013-04-151-0/+1
| |\ \ \ \
| | * | | | MDEV-26: Global Transaction ID.unknown2013-03-111-0/+1
* | | | | | 10.0-base mergeSergei Golubchik2013-04-151-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | 5.5 mergeSergei Golubchik2013-04-141-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | MDEV-4243 Warnings/errors while compiling with clangSergei Golubchik2013-03-281-1/+1
* | | | 10.0-base mergeSergei Golubchik2013-01-313-6/+21
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-01-291-1/+14
| |\ \ \ | | |/ /
| | * | fix embedded build with for cmake 2.6.2 (older cmake could not handle IF(NOT ...Vladislav Vaintroub2013-01-281-1/+3
| | * | fix embeddedVladislav Vaintroub2013-01-251-1/+0
| | * | Fix embedded buildVladislav Vaintroub2013-01-251-3/+4
| | * | MDEV-3842, MDEV-3923 :Vladislav Vaintroub2013-01-251-1/+12
| * | | test suite fixesSergei Golubchik2013-01-231-2/+3
| * | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-232-2/+2
| * | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-232-4/+5
* | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-1/+2
|\ \ \ \ | |/ / /
| * | | Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-1/+2
| |\ \ \
| | * \ \ Merge 5.5->5.5-mwl248Igor Babaev2012-08-141-2/+2
| | |\ \ \ | | | |/ /
| | * | | MergeIgor Babaev2012-06-013-3/+5
| | |\ \ \
| | * \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-112-3/+2
| | |\ \ \ \
| | * \ \ \ \ Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-1/+2
| | |\ \ \ \ \
| | | * \ \ \ \ Merged 5.3 changes into the mwl #248 tree.Igor Babaev2012-03-091-0/+1
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge with MariaDB 5.2Michael Widenius2012-02-211-0/+1
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-201-0/+1
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge with MYSQL 5.1.61Michael Widenius2012-02-201-0/+1
| | | | | | |\ \ \ \ \
| | | * | | | | | | | | The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-0/+1
| | | |/ / / / / / / /
* | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
* | | | | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-192-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-0/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | MWL#182: Explain running statementsSergey Petrunya2012-06-151-0/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | | * | | | | | | | MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-0/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | | | * | | | | | | MWL#182: Explain running statements: merge with 5.3-main (needs fixing)Sergey Petrunya2012-01-032-1/+2
| | | | | |\ \ \ \ \ \ \ | | | | | | |_|/ / / / / | | | | | |/| | | | | |
| | | | | | * | | | | | MWL#182: Explain running statementsSergey Petrunya2011-10-272-1/+2
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Fix windows build: add my_apc.{h,cc} to CMakeLists.txt filesSergey Petrunya2011-08-251-0/+1
View Lorry Controller Status