summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Merge with next-mrKonstantin Osipov2009-11-208-26/+430
|\
| * 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 gkodinov/kgeorge@magare.gmz2008-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
* | | | 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
* | | | 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-releasekaren.langford@sun.com2009-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...2009-10-281-5/+7
| | * | | | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-6/+20
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | merged 5.1-main-> 5.1-bugteamGeorgi Kodinov2009-10-231-0/+1
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ merge from 5.1 mainBjorn Munch2009-10-167-12/+80
| | | | |\ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ auto-mergeTatiana A. Nurnberg2009-10-201-7/+5
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ manual merge of 28141Tatiana A. Nurnberg2009-10-201-6/+20
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | / / / / / / | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd...Tatiana A. Nurnberg2009-10-191-3/+19
| | | | | |_|/ / / / / | | | | |/| | | | | |
| | * | | | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-052-0/+71
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Bug #47423 mtr connects to wrong databaseVladislav Vaintroub2009-11-032-0/+71
| | * | | | | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-7/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to unders...2009-10-201-7/+5
| | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | new merge from trunkBjorn Munch2009-10-227-11/+74
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
* | | | | | | | | | | Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sq...Alexey Botchkov2009-11-111-2/+4
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-052-185/+120
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-5/+17
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-291-5/+17
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-285-28/+21
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-273-2/+12
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-231-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-227-7/+78
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-288-30/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-237-6/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Pull from mysql-next-mr-runtime.Alexander Nozdrin2009-10-161-57/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Backport of 2617.65.4 from 6.0-codebase.Konstantin Osipov2009-10-161-10/+9
| | * | | | | | | | | | | | | | | Backport of:Konstantin Osipov2009-10-161-47/+1