summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* After merge fixesmonty@mysql.com2006-05-041-8/+11
* Merge mysql.com:/home/jimw/my/mysql-4.1-wl2852jimw@mysql.com2006-05-031-6/+52
|\
| * In the command-line client, try to abort the current query by issuing ajimw@mysql.com2005-10-051-6/+53
* | Merge mysql.com:/home/dlenev/mysql-5.0-bg11081dlenev@mysql.com2006-05-021-1/+1
|\ \
| * \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0holyfoot@mysql.com2006-05-021-1/+1
| |\ \
| | * | Win build fixholyfoot@deer.(none)2006-05-021-1/+1
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-05-012-6/+9
|\ \ \ \ | |/ / /
| * | | Merge bk-internal:/home/bk/mysql-5.0jimw@mysql.com2006-05-011-2/+4
| |\ \ \ | | |/ /
| | * | Fix for Win buildholyfoot@deer.(none)2006-05-011-2/+4
| * | | Merge mysql.com:/home/jimw/my/mysql-5.0-18312jimw@mysql.com2006-05-011-4/+5
| |\ \ \ | | |/ / | |/| |
| | * | Bug #18312: mysqltest: --sleep=0 doesn't disable sleepjimw@mysql.com2006-04-211-4/+5
| * | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0holyfoot@mysql.com2006-04-282-1/+405
| |\ \ \
| | * | | bug #18115 (mysql_upgrade on Windows)holyfoot@deer.(none)2006-04-282-1/+405
| * | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-04-271-3/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Backport fix for mysql client not using SSl library directlymsvensson@neptunus.(none)2006-04-221-3/+2
| | |/ /
| * | | Mergekent@mysql.com2006-04-211-9/+2
| |\ \ \ | | |/ / | |/| |
* | | | Merge mysql.com:/home/jimw/my/mysql-5.1-18495jimw@mysql.com2006-05-011-1/+7
|\ \ \ \
| * | | | Bug #18495: mysqltest does not use the correct error numberjimw@mysql.com2006-04-211-1/+7
* | | | | mysqlslap.c:paul@polar.kitebird.com2006-04-281-2/+2
* | | | | Corrected include path to work under Windowsmskold@mysql.com2006-04-261-1/+1
* | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-newmskold@mysql.com2006-04-251-1/+3
|\ \ \ \ \
| * | | | | Fix for Bug #17840 mysqldump should not dump tables in database cluster, reu...mskold@mysql.com2006-04-241-2/+2
| * | | | | Fix for Bug #17840 mysqldump should not dump tables in database cluster, ski...mskold@mysql.com2006-04-241-1/+3
| |/ / / /
* | | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/jimw_mergecmiller@zippy.(none)2006-04-241-8/+10
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Only expand the empty string to the letters "NULL" if the columncmiller@zippy.(none)2006-04-161-8/+10
* | | | Mergekent@mysql.com2006-04-181-9/+2
|\ \ \ \
| * \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releasekent@mysql.com2006-04-181-9/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mysql.cc:serg@mysql.com2006-04-181-9/+2
| * | | | Child segfault when tring to call "mysql_error(NULL)", fixed by notbpontz@shasta.mysql.com2006-04-121-1/+1
* | | | | Final patch to remove the last of the OS2 support. brian@zim.(none)2006-04-152-43/+9
* | | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.(none)2006-04-141-29/+50
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.(none)2006-04-111-29/+50
| |\ \ \ \
| | * | | | Bug#18265: mysql client: No longer right-justifies numeric columnscmiller@zippy.(none)2006-04-041-29/+50
| | | |/ / | | |/| |
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newtomas@poseidon.ndb.mysql.com2006-04-131-12/+18
|\ \ \ \ \
| * | | | | increase save_master_pos timeout to 30 seconds for higher test predictabilitytomas@poseidon.ndb.mysql.com2006-04-121-12/+18
| | |_|/ / | |/| | |
* | | | | Merge mysql.com:/home/jimw/my/mysql-5.1-refactorjimw@mysql.com2006-04-123-338/+0
|\ \ \ \ \
| * | | | | Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,jimw@mysql.com2006-04-113-338/+0
* | | | | | Protect from empty --query argumentmsvensson@neptunus.(none)2006-04-111-2/+2
* | | | | | Bug#18012 mysqlslap fails if querystring starts with delimitermsvensson@neptunus.(none)2006-04-111-2/+2
* | | | | | Fix syntax errormsvensson@neptunus.(none)2006-04-111-2/+1
* | | | | | Bug#17478 mysqlslap not issuing any queriesmsvensson@neptunus.(none)2006-04-111-75/+75
* | | | | | Don't use the MYSQL* returned from mysql_real_connect to overwrite the alread...msvensson@neptunus.(none)2006-04-111-5/+5
|/ / / / /
* | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-04-111-0/+30
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Remove #if 0msvensson@neptunus.(none)2006-04-071-1/+1
| * | | | Incorporate a patch to write a timestamp for every new line of the test that ...msvensson@neptunus.(none)2006-04-051-0/+30
| | |/ / | |/| |
* | | | Merge bk-internal:/home/bk/mysql-5.1-newmsvensson@neptunus.(none)2006-04-111-3/+2
|\ \ \ \
| * | | | Update implementation of new function 'mysql_get_ssl_cipher' after reviewmsvensson@neptunus.(none)2006-04-101-2/+2
| * | | | Add new function mysql_get_ssl_cipher to libmysl and use it from client to av...msvensson@neptunus.(none)2006-04-071-3/+2
| | |/ / | |/| |
* | | | mysql_upgrade.c:kent@mysql.com2006-04-111-3/+3
* | | | WL#2645 (mysql_upgrade tool)holyfoot@deer.(none)2006-04-101-77/+269