summaryrefslogtreecommitdiff
path: root/storage/ndb/src
Commit message (Expand)AuthorAgeFilesLines
* mysql-5.5.18 mergeSergei Golubchik2011-11-031-3/+4
|\
| * Updated/added copyright headersKent Boortz2011-07-041-3/+4
* | merge with 5.3Sergei Golubchik2011-10-191-1/+1
|\ \
| * \ Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-2850-2698/+225
| |\ \
| | * \ Merge with MySQL 5.1.55Michael Widenius2011-02-2050-2698/+225
| | |\ \
| * | | | Fix compilation errors (and some warnings) when compiling ndbMichael Widenius2011-01-291-1/+1
| |/ / /
| * | | Fixed compiler and gmake warningsMichael Widenius2010-11-2924-74/+0
* | | | 5.5-mergeSergei Golubchik2011-07-0252-2706/+235
|\ \ \ \ | | |_|/ | |/| |
| * | | BUG#11762616: BUG#55229: 'POSTION'Luis Soares2011-05-061-7/+9
| |\ \ \
| | * | | BUG#11762616: BUG#55229: 'POSTION' Luis Soares2011-05-061-7/+9
| | | |/ | | |/|
| * | | MergeKent Boortz2010-12-2950-2698/+225
| |\ \ \ | | |/ /
| | * | MergeKent Boortz2010-12-2950-2698/+225
| * | | Fixed compilation error.Sven Sandberg2010-11-081-1/+1
* | | | lots of post-merge changesSergei Golubchik2011-04-251-1/+1
* | | | merge.Sergei Golubchik2010-11-252-4/+9
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge with MySQL 5.1.50Michael Widenius2010-08-272-19/+34
| |\ \ | | |/
| * | Merge with MySQL 5.1, with following additions:unknown2009-11-162-10/+10
| |\ \
| * \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-153-7/+11
| |\ \ \
| * \ \ \ Merge MySQL->MariaDBSergey Petrunya2009-09-082-2/+2
| |\ \ \ \
| * \ \ \ \ Merge with base MySQL 5.1Michael Widenius2009-02-151-1/+1
| |\ \ \ \ \
| * | | | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-316-18/+23
* | | | | | | Backport fixes for some of the more noise compiler warnings in ndb.Davi Arnaut2010-07-242-4/+4
* | | | | | | Bug#42733: Type-punning warnings when compiling MySQLDavi Arnaut2010-07-244-23/+23
* | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-154-6/+6
|\ \ \ \ \ \ \
| * | | | | | | 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-082-4/+4
* | | | | | | | 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
* | | | | | | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-1924-76/+0
* | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-03-091-1/+1
* | | | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-02-261-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-02-121-1/+1
| |/ / / / / /
* | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-243-12/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Apply patch on behalf of the NDB team:Davi Arnaut2010-01-203-12/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Automerge.Davi Arnaut2009-11-021-1/+1
* | | | | | Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-164-16/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | A patch for Bug#45118 (mysqld.exe crashed in debug modeAlexander Nozdrin2009-09-101-9/+9
| | |_|_|/ | |/| | |
| * | | | Increase thread stack size on HP-UX when built with debug.Davi Arnaut2009-09-021-1/+6
| * | | | Bug#45611: Minor code cleanupDavi Arnaut2009-09-012-6/+5
| | |_|/ | |/| |
* | | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-1/+1
|\ \ \ \ | |/ / /
| * | | Auto-mergeIgnacio Galarza2009-07-311-1/+1
* | | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-1/+1
|\ \ \ \ | |/ / /
| * | | Add missing newline to usage message of ndb_print_backup_file (Bug #34989)Jim Winstead2009-04-281-1/+1
| | |/ | |/|
* | | Bug #44536: MySQL 5.4 version mismatch in the sourcesMySQL Build Team2009-05-221-1/+1
|/ /
* | Revert faulty commitunknown2008-04-271-1/+1
* | Add supression for expected warning(s) in slaves error logunknown2008-04-271-1/+1
|/
* Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-03-271-1/+1
|\
| * Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-142-3/+4
| |\