summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-162-19/+3
|\
| * Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-14/+0
| |\
| | * Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-14/+0
| * | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-5/+3
| |\ \ | | |/
| | * Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1115-268/+217
| | |\
| | * \ merge to mysql-5.1-bugteamSatya B2009-11-261-3/+1
| | |\ \
| | | * \ auto-mergeTatiana A. Nurnberg2009-11-241-3/+1
| | | |\ \
| | | | * | Bug#47655: Memory free error when connecting to 4.1 server from 5.1+ clientTatiana A. Nurnberg2009-11-021-3/+1
| | * | | | Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39Satya B2009-11-251-2/+2
| | |/ / /
| | * | | Post-merge fixes: fix typo and remove unused variables.Davi Arnaut2009-11-211-4/+1
* | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-1110-12/+28
|\ \ \ \ \ | |/ / / /
| * | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-1/+18
| |\ \ \ \
| * \ \ \ \ Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-256-24/+24
| |\ \ \ \ \
| * \ \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-208-26/+430
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merging.Alexey Botchkov2009-11-1710-12/+28
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Bug#47216 programs should quit if the file specified by --defaults-file ...Alexey Botchkov2009-10-0910-13/+28
* | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-093-11/+45
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Manual resolving for the following filesAndrei Elkin2009-12-011-1/+18
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-303-37/+126
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | mergeVladislav Vaintroub2009-11-033-38/+57
| | |\ \ \ \ \
| * | | | | | | Bug #48463 backporting from 6.0-rpl to celosia a set of bugsAndrei Elkin2009-11-201-1/+18
| * | | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-131-1/+1
| * | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-1/+1
| * | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-067-12/+81
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Backport of:Konstantin Osipov2009-11-246-24/+24
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-198-26/+430
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Bug #33544 UDF_INIT member decimals initialized wrong with Magne Mahre2009-11-112-4/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Bug #33544: UDF_INIT member decimals initialized wrong with unknown2008-03-052-4/+1
| * | | | | | | | Bug #37097 mysqltest add result file format version 2Magne Mahre2009-11-111-7/+120
| * | | | | | | | Return type fix (strlen returns size_t)Magne Mahre2009-11-111-1/+1
| * | | | | | | | Bug #5724 'mysqladmin password' should be allowed to prompt for passwordMagne Mahre2009-11-111-9/+30
| * | | | | | | | Backport of Bug#41860 to mysql-next-mrDavi Arnaut2009-11-101-0/+38
| * | | | | | | | Fix compile error on HP/UX. Magne Mahre2009-11-051-3/+3
| * | | | | | | | BUG #8368 "mysqldump needs --slave-data option"Magne Mahre2009-11-042-0/+186
| * | | | | | | | Bug#26780: automatic vertical output for wide resultsMagne Mahre2009-11-042-3/+91
| * | | | | | | | Bug#35224: mysqldump --help is very confusingMagne Mahre2009-11-032-2/+2
* | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-123-25/+108
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-1/+0
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix manual-merge (2nd attempt).Alexander Nozdrin2009-11-101-2/+0
| * | | | | | | | | | Fix manual-merge.Alexander Nozdrin2009-11-091-28/+21
| * | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-063-34/+126
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-24/+28
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | mergeGeorgi Kodinov2009-10-301-24/+28
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ merge from 5.0-mainGeorgi Kodinov2009-10-301-24/+28
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge from mysql-5.0.87-releaseunknown2009-10-261-24/+28
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | Added make targets 'test-bt-fast' and 'test-bt-debug-fast'Hery Ramilison2009-10-151-27/+28
| | * | | | | | | | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-5/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to unders...unknown2009-10-281-5/+7
| | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | * | | | | | | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-6/+20
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
View Lorry Controller Status