summaryrefslogtreecommitdiff
path: root/sql/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-0/+19
* 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-2/+4
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-03-271-2/+4
| |\ \ | | |/ | |/|
| | * MDEV-4267 : do not copy sql_yacc.cc and sql_yacc.h from unpacked source tarba...Vladislav Vaintroub2013-03-121-2/+4
* | | 10.0-base mergeSergei Golubchik2013-01-311-2/+2
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-01-291-2/+2
| |\ \ | | |/
| | * Fix Windows installers' bootstrapper scripts , after mysql_performance_table...Vladislav Vaintroub2013-01-181-1/+2
| | * mysql-5.5.29 mergeSergei Golubchik2013-01-151-1/+0
| | |\
| | | * Bug#13713525 CREATE_INITIAL_DB.CMAKE IS FAILING ON WINDOWS, STILL "DEVENV" RE...Tor Didriksen2012-10-031-3/+5
| | | * Bug#12845091 .EMPTY FILE IN /DATA/TEST PREVENTS USERS FROM DROPPING TEST DB O...Tor Didriksen2012-05-291-1/+4
* | | | 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
| |\ \ \
| | * \ \ MergeIgor Babaev2012-06-011-3/+3
| | |\ \ \ | | | |/ /
| | * | | Merge.Igor Babaev2012-05-181-2/+12
| | |\ \ \
| | * \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-111-1/+0
| | |\ \ \ \
| | * \ \ \ \ 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-1/+2
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-301-1/+2
| | | * | | | | | | | | The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-1/+2
| | | |/ / / / / / / /
* | | | | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey 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-031-0/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | MWL#182: Explain running statementsSergey Petrunya2011-10-271-0/+1
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Fix windows build: add my_apc.{h,cc} to CMakeLists.txt filesSergey Petrunya2011-08-251-0/+1
| * | | | | | | | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line.Igor Babaev2012-09-011-0/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-141-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-221-3/+3
|/ / / / / / / / / /
* | | | | | | | | | MDEV-207 Install headers required to build external storage pluginsSergei Golubchik2012-05-051-0/+6
* | | | | | | | | | Use test/db.opt as dummy file in the package, instead of test/.emptyVladislav Vaintroub2012-04-151-2/+6
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | MDEV-15 Log all sql errors.Alexey Botchkov2012-03-241-1/+0
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Fix compile error - linker does not find extern variables, in sql_logger.cVladislav Vaintroub2012-03-151-1/+1
* | | | | | | | MDEV-15 Log SQL errors.Alexey Botchkov2012-03-141-0/+1
* | | | | | | | merge 5.5Vladislav Vaintroub2012-02-271-0/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge latest MariaDB 5.5 into MWL#192: Non-blocking client library.unknown2012-02-221-6/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-211-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | MWL#192: Non-blocking client API for libmysqlclient.unknown2011-09-201-0/+1
* | | | | | | | | | | mergeVladislav Vaintroub2012-02-081-6/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | a couple of fixes for testsSergei Golubchik2012-01-311-6/+1
| |/ / / / / / / / /
* | | | | | | | | | mergeVladislav Vaintroub2012-01-241-3/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-2/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-12-021-0/+1
View Lorry Controller Status