summaryrefslogtreecommitdiff
path: root/cmd-line-utils
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2012-01-1350-3005/+5384
|\
| * Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-293-10/+10
| * Merge with MySQL 5.1.60Michael Widenius2011-11-2351-3003/+5386
| |\
| | * Patch to fix stdint.h missing from pre Solaris 10 versions.Karen Langford2011-10-292-0/+12
| | * Patch to fix libedit vis.h problem (OSX/FreeBSD)Karen Langford2011-10-283-9/+9
| | * WL#5945 - Improve libedit libraryNirbhay Choubey2011-10-242-3/+3
| | * Bug#13106585 PUSH FOR "WL#5945 : IMPROVE LIBEDIT LIBRARY"Nirbhay Choubey2011-10-216-22/+19
| | * Bug#13102538 : COMPILE ERROR ON SOLARIS WHEN COMPILINGNirbhay Choubey2011-10-185-5/+0
| | * WL#5945 : Improve libedit libraryNirbhay Choubey2011-10-1452-2994/+5373
| * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-5/+16
| |\ \ | | |/
* | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-1/+1
|\ \ \
| * \ \ Updated/added copyright headersKent Boortz2011-06-301-1/+1
| |\ \ \
* | \ \ \ merge with 5.3Sergei Golubchik2011-10-192-3/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-3/+10
| |\ \ \ \
| * | | | | Build fixes:Vladislav Vaintroub2011-02-261-1/+1
| * | | | | Fixed compiler warningsMichael Widenius2011-02-252-3/+3
| * | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Fixed compiler warningsMichael Widenius2011-02-101-2/+3
| * | | | | Fixed compiler and gmake warningsMichael Widenius2010-11-291-3/+0
| * | | | | Merge with MySQL 5.1.53Michael Widenius2010-11-2510-39/+52
| |\ \ \ \ \
* | \ \ \ \ \ 5.5-mergeSergei Golubchik2011-07-0217-195/+95
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge of fix for bug#11757855 from mysql-5.1 -> mysql-5.5.Nirbhay Choubey2011-04-301-5/+16
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Bug#11757855 - 49967: built-in libedit doesn't readNirbhay Choubey2011-04-291-5/+16
| | | |_|_|/ | | |/| | |
| * | | | | Merge of fix for bug#12329909 from mysql-5.1 -> mysql-5.5.Nirbhay Choubey2011-04-271-2/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | BUG#12329909 - BUILDING MYSQL WITH DEBUG SUPPORTNirbhay Choubey2011-04-271-2/+10
| | | |_|/ | | |/| |
| * | | | Remove configuration preprocessor symbols 'THREAD'Magne Mahre2011-01-111-1/+1
| * | | | Fix detection of tgoto declaration:Vladislav Vaintroub2010-11-271-0/+15
| * | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-203-147/+0
| * | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-11-161-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-1/+1
| | | |/ | | |/|
| * | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-10-207-13/+16
| |\ \ \ | | |/ /
| | * | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-207-13/+16
| * | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-10-193-24/+33
| |\ \ \ | | |/ /
| | * | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-194-26/+34
| * | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-10-191-4/+4
| |\ \ \ | | |/ /
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-10-191-4/+4
* | | | merge.Sergei Golubchik2010-11-259-32/+24
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge with MySQL 5.1.50Michael Widenius2010-08-273-4/+3
| |\ \ | | |/
| * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-2/+2
| |\ \
| * | | Fixed compiler warningsMichael Widenius2010-03-311-2/+1
| * | | Fixed link problem when compiling without ucaMichael Widenius2009-12-011-0/+7
| * | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-302-6/+1
| |\ \ \
| | * \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-3/+3
| | |\ \ \
| * | | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-306-10/+15
| |/ / / /
| * | | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-153-8/+8
| |\ \ \ \
| * \ \ \ \ MySQL 5.1.38 merge into MariaDB.unknown2009-09-151-2/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge MySQL->MariaDBSergey Petrunya2009-09-0826-202/+218
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-1155-3917/+2264
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-2840-42/+44
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed compiler warnings in a lot of filesunknown2008-02-136-14/+13