summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Merging conflicts resolvedunknown2005-01-111-1/+11
|\
| * Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2005-01-111-1/+11
| |\
| | * fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)unknown2005-01-031-1/+11
* | | Mergeunknown2005-01-082-4/+8
|\ \ \ | |/ /
| * | few harmless warnings from automated code-checking tools fixedunknown2005-01-082-4/+8
* | | Merge mysql.com:/home/jwinstead2/mysql-4.1-cleanunknown2005-01-062-4/+44
|\ \ \ | |/ /
| * | Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-061-2/+10
| |\ \
| | * | postreview changesunknown2005-01-061-4/+4
| | * | fixed comparation with string constant on some platform (BUG#7651)unknown2005-01-061-2/+10
| * | | Merge mysql.com:/home/jwinstead2/mysql-4.1-7451unknown2005-01-061-1/+7
| |\ \ \
| | * | | Add support for --default-character-set to mysqladmin (Bug #7524)unknown2005-01-061-1/+7
| | |/ /
| * | | Fix "mysqladmin password" to use correct password scrambling function whenunknown2005-01-051-1/+27
| |/ /
| * | Merge mysql.com:/home/wax/mysql/mysql-4.1unknown2005-01-021-1/+3
| |\ \ | | |/ | |/|
| | * WL#964unknown2005-01-021-1/+3
* | | manually mergedunknown2004-12-312-8/+94
|\ \ \ | |/ /
| * | client/mysqldump.cunknown2004-12-281-28/+15
| * | WL#2319 V2: Exclude tables from dumpunknown2004-12-272-7/+100
| * | Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8unknown2004-12-221-0/+6
* | | Manual merge.unknown2004-12-311-107/+307
|\ \ \
| * \ \ Manual merge of patch implementing WL#1339 with main tree.unknown2004-12-291-107/+307
| |\ \ \
| | * | | WL#1339 "Add per account max_user_connections limit (maximum number unknown2004-12-291-107/+307
* | | | | Merge with global treeunknown2004-12-314-9/+15
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge with 4.1unknown2004-12-224-9/+15
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mysql.cc:unknown2004-12-181-2/+2
| | * | | Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling ...unknown2004-12-171-1/+1
| | | |/ | | |/|
| | * | corrected mysqltest.dspunknown2004-12-141-1/+4
| | * | Makefile.am:unknown2004-12-101-2/+3
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-091-2/+4
| | |\ \
| | | * | Ensure that we free memory used with --order-by-primary (in mysqldump)unknown2004-12-091-2/+4
| | * | | help text correctedunknown2004-12-041-1/+1
| | |/ /
* | | | A fix (bug #7283: Test failure: 'update' (using '--ps-protocol': server crash)).unknown2004-12-201-1/+1
|/ / /
* | | WL#1051, more maintanable error messages.unknown2004-12-131-1/+1
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-121-0/+4
|\ \ \
| * | | fix according to reviewunknown2004-12-101-2/+2
| * | | Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privil...unknown2004-12-101-0/+4
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-107-0/+8
|\ \ \ \ | |/ / /
| * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-097-0/+8
| |\ \ \
| | * | | Changing the default of libmysqlclient : it's now NO reconnection.unknown2004-12-097-0/+8
* | | | | Fixed that mysql-test-run --ps-protocol works with system_mysql_db_fix.testunknown2004-12-081-6/+10
|/ / / /
* | | | Merge with new VARCHAR codeunknown2004-12-062-7/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Add support for up to VARCHAR (size up to 65535)unknown2004-12-062-7/+8
* | | | Merge with 4.1unknown2004-12-063-27/+131
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge bk-internal:/home/bk/mysql-4.1unknown2004-12-022-25/+122
| |\ \
| | * \ Mergeunknown2004-11-302-25/+122
| | |\ \
| | | * | mysqldump.c:unknown2004-11-301-19/+15
| | | * | Add --order-by-primary option, which adds an ORDER BYunknown2004-11-162-25/+126
| * | | | Fix for Bug#6377 "Password Generation Discrepancy"unknown2004-12-021-2/+9
* | | | | Merge for Matt for Innodb bug. unknown2004-11-302-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-301-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | A fix (bug #6101: mysqldump writes invalid SQL).unknown2004-10-191-1/+1