summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* 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-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
| | | | | | | * | | | | MWL#182: Explain running statementsSergey Petrunya2011-08-231-1/+1
| * | | | | | | | | | | Merge MDEV-415 -> 10.0-base.Igor Babaev2012-09-011-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line.Igor Babaev2012-09-011-0/+1
| | |/ / / / / / / / /
| * | | | | | | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | mysql_client_test did not build within limbysqld/examplesBjorn Munch2012-07-101-0/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | mysql_client_test did not build within limbysqld/examplesBjorn Munch2012-07-102-2/+4
* | | | | | | | | | | | fix the embedded buildSergei Golubchik2012-09-271-1/+1
* | | | | | | | | | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-1/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Building RPMs with CPackSergei Golubchik2012-05-222-3/+3
* | | | | | | | | | | cSergei Golubchik2012-05-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | / / / / / / / / | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | BUG#13738989 : 62136 : FAILED TO FETCH SELECT RESULT USING EMBEDDED MYSQLDMayank Prasad2012-04-061-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | BUG#13738989 : 62136 : FAILED TO FETCH SELECT RESULT USING EMBEDDED MYSQLDMayank Prasad2012-04-061-0/+2
* | | | | | | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-282-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Updated/added copyright headersMySQL Build Team2012-02-162-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Updated/added copyright headersKent Boortz2012-02-151-2/+1
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-301-0/+1
* | | | | | | | | | MDEV-15 Log all sql errors.Alexey Botchkov2012-03-241-1/+0
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Reduce size of windows MSI by approx. 50%Vladislav Vaintroub2012-03-161-3/+6
View Lorry Controller Status