summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Fixed compiler warnings and sporadic failures in test casesMichael Widenius2010-03-281-0/+5
| * | | | | Fix some compiler warnings seen in Buildbot.unknown2010-03-101-1/+1
| * | | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-042-6/+26
| |\ \ \ \ \
| * | | | | | Fixed compiler warnings & failing test casesMichael Widenius2010-01-281-0/+10
| * | | | | | Merge with fixes for compiler warnings and 2 fixed test casesMichael Widenius2010-01-281-0/+13
| * | | | | | Removed compiler warningsMichael Widenius2010-01-061-0/+3
| * | | | | | Merge free documentation from MySQL 5.1.41 source tarball into MariaDB.unknown2009-12-011-118/+333
| |\ \ \ \ \ \
| | * | | | | | Imported MySQL documentation files from MySQL 5.1.41 source tarballunknown2009-12-011-118/+333
| * | | | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-0/+24
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-061-1/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-1/+1
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Automatic mergeMichael Widenius2009-10-235-2/+15
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixes for binary distribution in tar fileMichael Widenius2009-10-235-2/+15
| * | | | | | | | | | | Merge Peter Lieverdink's fixes:unknown2009-10-231-2/+29
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Add `configtest' option to the init script to check for a valid my.cnf file.Peter Lieverdink2009-10-161-2/+29
| | |/ / / / / / / / /
| * | | | | | | | | | MBUG#452116: MariaDB: mysql_install_db causes server segfaultSergey Petrunya2009-10-162-2/+2
| |/ / / / / / / / /
| * | | | | | | | | Fix some compiler warnings cause by GCC bug: http://gcc.gnu.org/bugzilla/show...unknown2009-10-031-0/+3
| * | | | | | | | | MySQL 5.1.38 merge into MariaDB.unknown2009-09-151-5/+14
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-152-0/+124
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix most Compiler warnings seen in buildbot.unknown2009-09-032-0/+124
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | After-merge fixes for merge of MySQL-5.1.38.unknown2009-09-111-1/+1
| * | | | | | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-088-73/+70
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Imported freely distributable documentation from upstream MySQL 5.1.34 source...unknown2009-05-251-5/+160
| * | | | | | | | | | MergeMichael Widenius2009-05-191-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix support-files/build-tags for newer bzr which do not default to --recursiv...unknown2009-05-181-1/+1
| * | | | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-256-11/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-014-4/+0
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-112-8/+9
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-122-28/+69
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge with base MySQL 5.1Michael Widenius2009-02-152-28/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| / / / / / / / / / / / / | | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-216-14/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-105-4/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-289-8/+523
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | mysql.spec.sh:unknown2008-02-211-20/+30
| * | | | | | | | | | | | | | | | Fixed compiler warnings by adding casts and changing variable typesunknown2008-01-111-1/+1
| * | | | | | | | | | | | | | | | Added --loose-skip-maria to MYSQLD_BOOTSTRAP_CMD to get bootstrap.test to workunknown2008-01-111-0/+1
| * | | | | | | | | | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-12-272-2/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-162-2/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-10-082-2/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-272-2/+18
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-07-041-0/+5
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | After merge fixesunknown2007-07-011-0/+5
| | | | | * | | | | | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-2/+13
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | Fixes after review of guilhem of block record patchunknown2007-04-191-2/+2
| | | | | | * | | | | | | | | | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-2/+13
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | | | Postreview changes.unknown2007-02-191-0/+7
| | | | | | | * | | | | | | | | | | | | | | | Merge with new versionunknown2007-01-231-2/+6
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | | | | | Implementation of rows-in-blockunknown2007-01-181-2/+6
* | | | | | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-181-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-161-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \