summaryrefslogtreecommitdiff
path: root/storage/csv
Commit message (Expand)AuthorAgeFilesLines
* 5.5 mergeSergei Golubchik2013-04-141-3/+3
|\
| * MDEV-4243 Warnings/errors while compiling with clangSergei Golubchik2013-03-281-3/+3
* | * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-072-33/+11
* | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-2/+2
* | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-2/+2
* | simplify the handler api - table_type() is no longer abstract, not even virtualSergei Golubchik2012-12-171-1/+0
* | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-6/+0
|/
* mergeSergei Golubchik2012-04-072-4/+14
|\
| * Merge with 5.1Michael Widenius2012-04-042-11/+20
| |\
| | * Fixed lp:970528 "Server crashes in my_strnncollsp_simple on LEFT JOIN with CS...Michael Widenius2012-04-042-11/+20
* | | Merge of compatibility fixesMichael Widenius2012-04-021-0/+2
|\ \ \ | |/ /
| * | Merge with 5.1Michael Widenius2012-03-281-0/+2
| |\ \ | | |/
| | * Fixed lp:944422 "mysql_upgrade destroys Maria tables?"Michael Widenius2012-03-281-0/+2
* | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-2/+1
|\ \ \
| * \ \ Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \ \
* | \ \ \ 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge with MariaDB 5.1Michael Widenius2011-11-246-10/+22
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-216-10/+22
| | |\ \ \ | | | | |/ | | | |/|
| * | | | merge with 5.1Sergei Golubchik2011-10-071-1/+0
| |\ \ \ \ | | |/ / /
| | * | | remove redundant declarationsSergei Golubchik2011-10-041-1/+0
* | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-034-9/+11
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merging into mysql-5.5.16-release.Mats Kindahl2011-08-151-1/+2
| * | | | Updated/added copyright headersKent Boortz2011-06-304-8/+9
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Updated/added copyright headersKent Boortz2011-06-306-10/+22
* | | | | merge with 5.3Sergei Golubchik2011-10-191-3/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | mergeVladislav Vaintroub2010-12-061-3/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-3/+0
| * | | | merge with 5.1Michael Widenius2010-11-301-2/+0
| |\ \ \ \ | | |/ / /
| | * | | Fixed compiler and gmake warningsMichael Widenius2010-11-291-2/+0
| * | | | Merge MariaDB 5.1->5.2unknown2010-11-192-6/+5
| |\ \ \ \ | | |/ / /
| | * | | MWL#74: Shared libmysqld.so library.unknown2010-11-172-6/+5
* | | | | 5.5-mergeSergei Golubchik2011-07-023-70/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bug #11755431 (former 47205)Jon Olav Hauglid2011-03-081-1/+2
| * | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-202-69/+0
* | | | | merge.Sergei Golubchik2010-11-253-5/+40
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | merge with 5.1Sergei Golubchik2010-09-112-10/+6
| |\ \ \ | | |/ /
| | * | build dynamic plugins with the -shared libtool option to avoidSergei Golubchik2010-09-091-1/+1
| | * | Merge with MySQL 5.1.50Michael Widenius2010-08-272-10/+6
| | |\ \ | | | |/
| * | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+7
| |\ \ \ | | |/ /
| | * | Fixed trival bug introduced in last patch (buffer was not extended)Michael Widenius2010-06-231-1/+5
| | * | Fixes for Opensolaris (to get buildbot green)Michael Widenius2010-06-231-0/+3
| * | | merge 5.1->5.2Sergei Golubchik2010-06-011-2/+14
| |\ \ \ | | |/ /
| | * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-2/+14
| | |\ \
| * | | | Maria WL#61unknown2010-04-011-1/+17
| |/ / /
| * | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-2/+2
| |\ \ \
| * \ \ \ Merge MySQL->MariaDBSergey Petrunya2009-09-081-9/+2
| |\ \ \ \
| * \ \ \ \ Merged with mysql-5.1 tree.Michael Widenius2009-04-254-38/+39
| |\ \ \ \ \
| * \ \ \ \ \ Merge with base MySQL 5.1Michael Widenius2009-02-151-0/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-19/+19
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2008-05-291-1/+1
| |\ \ \ \ \ \ \ \
View Lorry Controller Status