summaryrefslogtreecommitdiff
path: root/storage/ndb
Commit message (Expand)AuthorAgeFilesLines
* mysql-5.5.37 selective mergeSergei Golubchik2014-03-271106-0/+1106
|\
| * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-171106-0/+1106
* | MySQL-5.5.36 mergeSergei Golubchik2014-02-171053-1055/+1058
|\ \ | |/
| * Updated/added copyright headersMurthy Narkedimilli2014-01-061053-1055/+1058
* | mysql-5.5.32 mergeSergei Golubchik2013-07-161067-1085/+1085
|\ \ | |/
| * Correcting the permissions of the executable files.Murthy Narkedimilli2013-03-2024-0/+0
| * Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191067-1085/+1085
* | 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+0
|\ \
| * \ merge with 5.1Sergei Golubchik2011-10-071-1/+0
| |\ \
| | * | remove redundant declarationsSergei Golubchik2011-10-041-1/+0
* | | | mysql-5.5.18 mergeSergei Golubchik2011-11-0314-487/+142
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge from mysql-5.5.14-releaseunknown2011-07-064-516/+0
| |\ \ \
| | * \ \ weave merge of mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-05-101-7/+9
| | |\ \ \
| | * \ \ \ merge 5.1-security->5.5-securityGeorgi Kodinov2011-04-274-484/+0
| | |\ \ \ \
| | | * | | | Bug #11810224: CORRECT INVALID LGPL NOTICE IN CLUSTER FILES Georgi Kodinov2011-04-184-484/+0
| * | | | | | Updated/added copyright headersKent Boortz2011-07-041-3/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Updated/added copyright headersKent Boortz2011-06-3011-0/+170
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Updated/added copyright headersKent Boortz2011-06-3032-39/+230
| | | |/ / / | | |/| | |
* | | | | | merge with 5.3Sergei Golubchik2011-10-193-3/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-2897-2790/+906
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge with MySQL 5.1.55Michael Widenius2011-02-2097-2790/+906
| | |\ \ \ \ | | | | |/ / | | | |/| |
| * | | | | Fix compilation errors (and some warnings) when compiling ndbMichael Widenius2011-01-294-7/+6
| * | | | | Fixed typosMichael Widenius2011-01-072-2/+2
| |/ / / /
| * | | | Fixed compiler and gmake warningsMichael Widenius2010-11-2934-105/+0
* | | | | 5.5-mergeSergei Golubchik2011-07-02102-2800/+1269
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | BUG#11762616: BUG#55229: 'POSTION'Luis Soares2011-05-061-7/+9
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | BUG#11762616: BUG#55229: 'POSTION' Luis Soares2011-05-061-7/+9
| | | |/ | | |/|
| * | | BUG#57953 my_load_defaults return junk argument ----args-separator---- to callerHe Zhenxing2011-01-171-2/+2
| * | | MergeKent Boortz2010-12-2997-2790/+906
| |\ \ \ | | |/ /
| | * | MergeKent Boortz2010-12-2997-2790/+906
| * | | Fixed compilation error.Sven Sandberg2010-11-081-1/+1
| * | | Bug#56397 The version of NDB in MySQL Server should be constantMagnus Blåudd2010-10-071-4/+10
| * | | WL#5503 SEAGULL: Move config/ac-macros/ha_ndbcluster.m4 to storage/ndb/Magnus Blåudd2010-10-072-0/+345
* | | | lots of post-merge changesSergei Golubchik2011-04-253-3/+3
* | | | merge.Sergei Golubchik2010-11-253-5/+10
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge with MySQL 5.1.50Michael Widenius2010-08-272-19/+34
| |\ \ | | |/
| * | Fix test suite so that it works when doing configure --without-ucaMichael Widenius2009-12-271-1/+1
| * | Merge with MySQL 5.1, with following additions:unknown2009-11-162-10/+10
| |\ \
| * \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-154-336/+367
| |\ \ \
| * \ \ \ MySQL 5.1.38 merge into MariaDB.unknown2009-09-151-1/+2
| |\ \ \ \
| * \ \ \ \ Merge MySQL->MariaDBSergey Petrunya2009-09-084-6/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge with base MySQL 5.1Michael Widenius2009-02-154-7/+5
| |\ \ \ \ \ \
| * | | | | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-318-24/+29
* | | | | | | | Backport fixes for some of the more noise compiler warnings in ndb.Davi Arnaut2010-07-243-8/+8
* | | | | | | | Bug#42733: Type-punning warnings when compiling MySQLDavi Arnaut2010-07-2421-171/+171
* | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-159-15/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-152-2/+2
| * | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-087-13/+13
* | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-142-19/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Bug#48327: Some crashes specific to FreeBSD ("embedded")Davi Arnaut2010-07-142-19/+34