summaryrefslogtreecommitdiff
path: root/include/my_base.h
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL->MariaDBSergey Petrunya2009-09-081-1/+2
|\
| * merge 5.0-bugteam to 5.1-bugteamSatya B2009-07-241-1/+2
| |\
| | * Fix for BUG#18828 - If InnoDB runs out of undo slots, Satya B2009-07-171-1/+2
| | * Bug#39370: wrong output for error code 153Chad MILLER2009-02-241-0/+1
* | | Fix for bug#39226 Maria: crash with FLUSH TABLES WITH READ LOCK after LOCK TA...Michael Widenius2008-10-121-1/+3
* | | Added versioning of Maria indexMichael Widenius2008-06-261-1/+11
* | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2008-05-291-1/+2
|\ \ \
| * | | Added versioning of row dataunknown2008-04-101-3/+6
* | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-12/+15
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fixed problem with non-synchronous error listsunknown2008-03-281-3/+7
| * | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-151-24/+44
| |\ \
| | * \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-081-23/+43
| | |\ \
| | | * \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-071-23/+43
| | | |\ \
| | | | * | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-111-26/+45
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplunknown2008-02-111-3/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplunknown2008-02-051-1/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Bug #32971 No user level error message from slave sql thread when ER_NO_DEFAU...unknown2008-01-311-1/+3
* | | | | | Added --with-maria-tmp-tables (default one) to allow on to configure if Maria...unknown2008-01-101-1/+4
* | | | | | Merge jani@marvel:/my/bk/mysql-maria.newunknown2007-12-181-3/+7
|\ \ \ \ \ \
| * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-12-181-2/+4
| |\ \ \ \ \ \
| | * | | | | | move HA_OPTIONS_xxx where they belongunknown2007-12-171-2/+4
| * | | | | | | Fixed several bugs in page CRC handlingunknown2007-12-181-1/+3
| |/ / / / / /
* | | | | | | Fixed after-merge problems.unknown2007-12-161-1/+1
* | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-25/+43
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expe...unknown2007-12-041-1/+2
| * | | | | First part of redo/undo for key pagesunknown2007-11-141-1/+2
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-10-101-20/+30
| |\ \ \ \ \
| | * | | | | Moved randomize and my_rnd under mysysunknown2007-10-091-20/+30
| * | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-6/+12
| |\ \ \ \ \ \ | | |/ / / / / | | | | | / / | | |_|_|/ / | |/| | | |
| | * | | | Fixed some bugs when using undo of VARCHAR fieldsunknown2007-09-111-0/+1
| | * | | | Fixed several bugs found by running *.test with maria engineunknown2007-09-031-2/+4
| | * | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-071-3/+6
| | |\ \ \ \
| | | * \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-071-3/+6
| | | |\ \ \ \
| | | | * \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-07-041-0/+1
| | | | |\ \ \ \
| | | | | * | | | Fixed REPAIR/CHECK/ANALYZE TABLE for tables with new BLOCK-ROW format.unknown2007-07-011-0/+1
| | | | * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-3/+5
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-3/+5
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge with new versionunknown2007-01-231-2/+2
| | | | | | |\ \ \ \
| | | | | | | * | | | Implementation of rows-in-blockunknown2007-01-181-2/+2
| | | | | | * | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-181-1/+3
| | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-10-101-1/+3
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / /
| | | | | | | | * | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-2unknown2006-08-091-1/+3
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1unknown2006-05-241-1/+3
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * | | | Added storage/maria (based on MyISAM). WL#3245unknown2006-04-111-1/+3
* | | | | | | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-12-051-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge mysql.com:/home/ram/work/b31137/b31137.5.0unknown2007-10-291-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no ...unknown2007-10-261-1/+1
| | * | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-111-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ Merge stella.local:/home2/mydev/mysql-5.1-amainunknown2007-11-271-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Bug#31702 (Missing row on slave causes assertion failure under row-based repl...unknown2007-10-201-3/+5
| |/ / / / / / / / / / / /