summaryrefslogtreecommitdiff
path: root/client/mysql.cc
Commit message (Expand)AuthorAgeFilesLines
* Backport of:Konstantin Osipov2010-04-131-3/+3
* Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-41/+97
|\
| * A follow-up on WL#5154 and WL#5182: remove forgotten options.Alexander Nozdrin2010-03-031-2/+0
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-18/+18
| |\
| * | WL#5182 Remove more deprecated 4.1/5.0 featuresMagne Mahre2010-02-171-7/+0
| * | WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-02-171-16/+3
| * | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-1/+1
| |\ \
| * \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-181-2/+2
| |\ \ \
| | * | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-2/+2
| * | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-241-1/+2
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-5/+3
| |\ \ \ \
| * \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-201-3/+90
| |\ \ \ \ \
| | * \ \ \ \ Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-3/+90
| | |\ \ \ \ \
| | | * | | | | Fix compile error on HP/UX. Magne Mahre2009-11-051-3/+3
| | | * | | | | Bug#26780: automatic vertical output for wide resultsMagne Mahre2009-11-041-3/+90
| * | | | | | | merging.Alexey Botchkov2009-11-171-1/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Bug#47216 programs should quit if the file specified by --defaults-file ...Alexey Botchkov2009-10-091-1/+5
* | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-121-9/+11
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Bug #44178: mysql cli does not comply with GPLv2 clause 2cGeorgi Kodinov2010-03-111-9/+11
* | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-02-091-20/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Recommit of Bug#49447.Staale Smedseng2010-02-041-20/+24
* | | | | | | | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | WL#5182 Remove more deprecated 4.1/5.0 featuresMagne Mahre2010-01-271-1/+1
* | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-241-4/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-211-4/+13
* | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-251-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | mergeGeorgi Kodinov2009-12-241-1/+1
| |\ \ \ \ \
| | * | | | | Bug #48866: mysql.test fails under Fedora 12Georgi Kodinov2009-12-161-1/+1
| | * | | | | Backport fix for Bug #27884.Jim Winstead2009-11-231-4/+7
* | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-231-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Merge approved bug fixJim Winstead2009-12-171-1/+2
| |\ \ \ \ \
| | * | | | | The mysql command line client ignored the --skip-column-names optionJim Winstead2009-09-211-1/+2
* | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-12/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-6/+20
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-231-2/+2
| |\ \ \ \ \
| | * \ \ \ \ Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-1/+8
| | |\ \ \ \ \
| * | | | | | | WL#1349 Use operating system localization to send it as a default client char...Alexander Barkov2009-10-211-12/+8
| | |/ / / / / | |/| | | | |
| * | | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-151-1/+8
| | |_|/ / / | |/| | | |
* | | | | | merge to mysql-5.1-bugteamSatya B2009-11-261-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
|/ / / / /
* | | | | 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
* | | | mergeGeorgi Kodinov2009-10-141-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | "MySQL Network" => "MySQL Enterprise"Kent Boortz2009-10-081-1/+1
* | | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-231-1/+1
| |/ |/|
* | Merge from 5.0 for 43414Staale Smedseng2009-08-281-1/+2
|\ \ | |/
| * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-1/+2
* | Fix for a few assorted compiler warnings.Davi Arnaut2009-08-281-9/+9
* | Merge bug fix.Jim Winstead2009-07-301-3/+28
|\ \