summaryrefslogtreecommitdiff
path: root/cmd-line-utils
Commit message (Expand)AuthorAgeFilesLines
* Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-5/+16
|\
| * Bug#11757855 - 49967: built-in libedit doesn't readNirbhay Choubey2011-04-291-5/+16
* | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-3/+10
|\ \ | |/
| * BUG#12329909 - BUILDING MYSQL WITH DEBUG SUPPORTNirbhay Choubey2011-04-271-2/+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
|\ \ | |/
| * Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-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
|\ \ | |/
| * Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-207-13/+16
| * Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-194-26/+34
| * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-10-191-4/+4
* | Merge with MySQL 5.1.50Michael Widenius2010-08-273-4/+3
|\ \ | |/
| * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-022-1/+3
* | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-2/+2
|\ \ | |/
| * Bug #43414 Parenthesis (and other) warnings compiling Staale Smedseng2010-02-222-3/+3
* | 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
| |\ \ | | |/
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-231-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
|\ \ | |/
| * Merge from mysql-5.1.38-releaseJonathan Perkin2009-09-031-2/+7
| |\
| * \ Merge from 5.0 for 43414Staale Smedseng2009-08-283-8/+8
| |\ \
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-283-8/+8
* | | | MySQL 5.1.38 merge into MariaDB.unknown2009-09-151-2/+7
|\ \ \ \ | | |_|/ | |/| |
| * | | Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.Jonathan Perkin2009-08-141-2/+7
| |/ /
* | | Merge MySQL->MariaDBSergey Petrunya2009-09-0826-202/+218
|\ \ \ | |/ /
| * | Bug #43397 mysql headers redefine pthread_mutex_initStaale Smedseng2009-07-081-1/+1
| * | Merge from 5.0Staale Smedseng2009-06-2924-201/+217
| |\ \ | | |/
| | * Merge from 5.0-btStaale Smedseng2009-06-2924-201/+217
| * | Addendum to Bug #45286: backport macro name form other treeTatiana A. Nurnberg2009-06-063-4/+4
| * | merged 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2009-06-053-6/+5
| |\ \ | | |/
| | * Addendum to Bug #45286 : implement reviewer's remarks.Georgi Kodinov2009-06-051-4/+2
| | * Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSXGeorgi Kodinov2009-06-052-2/+3
| * | automergeGeorgi Kodinov2009-06-052-2/+4
| |\ \ | | |/
| | * Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSXGeorgi Kodinov2009-06-052-2/+4
| * | Merge from 5.0-bugteamStaale Smedseng2009-04-161-1/+1
| |\ \ | | |/
| | * Bug#42430 Final commit to 5.0-bugteamStaale Smedseng2009-04-161-1/+1
| * | merge -5.0 into -5.1 (minor conflicts resolved)Timothy Smith2009-04-011-1/+1
| |\ \ | | |/
| | * cmd-line-utils/libedit/readline/readline.hunknown2009-03-191-1/+1
| | * Back patched libedit portability changes from 5.1.32unknown2009-03-094-9/+6
* | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-1155-3917/+2264
|\ \ \ | |/ /
| * | Disabled libedit use of '__weak_reference' on FreeBSD, doesn't compileunknown2009-02-141-2/+2
| * | More portability fixes.unknown2009-02-122-6/+3
| * | Exclude libedit inclusion of <sys/ttydefaults.h> on AIX as wellunknown2009-02-121-1/+1
| * | Changed to use the correct "__sun" and "__hpux" predefinedunknown2009-02-111-1/+1
View Lorry Controller Status