summaryrefslogtreecommitdiff
path: root/cmd-line-utils
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | | Fixed bug in restoring auto-increment value in case of duplicate key with ins...unknown2008-01-311-14/+1
* | | | | | | | | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-122-6/+6
* | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-022-1/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-05-311-0/+2
* | | | | | | | | Bug #53445 Build with -Wall and fix warnings that it generatesTor Didriksen2010-05-261-2/+1
* | | | | | | | | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-192-6/+0
* | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-242-3/+3
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-02-232-3/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Bug #43414 Parenthesis (and other) warnings compiling Staale Smedseng2010-02-222-3/+3
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Fix build with LDFLAGS=--Wl,--as-needed on LinuxVladislav Vaintroub2009-12-191-1/+1
* | | | | | | | | mergeVladislav Vaintroub2009-12-161-3/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-3/+0
| |/ / / / / / /
* | | | | | | | Fix libedit out-of-source buildVladislav Vaintroub2009-11-101-1/+1
* | | | | | | | remove debug outputVladislav Vaintroub2009-11-101-1/+0
* | | | | | | | refactor libedit, generate files in binary tree, not in source treeVladislav Vaintroub2009-11-101-82/+83
* | | | | | | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-094-2/+229
|/ / / / / / /
* | | | | | | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-231-3/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge from mysql-5.1.38-releaseJonathan Perkin2009-09-031-2/+7
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.Jonathan Perkin2009-08-141-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
* | | | | 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