summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* Merge rama.(none):/home/jimw/my/tmp_mergejimw@rama.(none)2006-07-281-3/+33
|\
| * Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-181-1/+2
| |\
| | * Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-131-1/+2
| | |\
| | | * bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-011-1/+2
| * | | Merge mysql.com:/usr/home/bar/mysql-4.1.b7192bar@mysql.com2006-07-071-2/+31
| |\ \ \
| | * | | Bug#7192 Specify --with-collation doesn't work for connections?bar@mysql.com2006-06-301-2/+31
| | |/ /
* | | | Merge chilla.local:/home/mydev/mysql-5.0-mmergeingo/mydev@chilla.local2006-07-201-0/+7
|\ \ \ \ | |/ / /
| * | | client.c:kent@mysql.com2006-07-031-0/+7
* | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.(none)2006-07-101-1/+1
|\ \ \ \ | |/ / /
| * | | mergingholyfoot@mysql.com2006-06-261-37/+49
| |\ \ \ | | |/ /
* | | | Merge chilla.local:/home/mydev/mysql-5.0-ateamingo@chilla.local2006-07-061-36/+48
|\ \ \ \
| * \ \ \ Merge mysql.com:/home/mydev/mysql-4.1-bug14400ingo@mysql.com2006-07-051-36/+48
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | bug #20318 (ctype_ucs2_def test fails with embedded)holyfoot@deer.(none)2006-06-191-36/+48
| | |/
* | | Bug#18997: DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-dig...tnurnberg@mysql.com2006-05-161-1/+1
* | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2006-05-091-19/+107
|\ \ \ | |/ /
| * | Remove C++ commentsmsvensson@neptunus.(none)2006-05-031-5/+5
| * | Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208msvensson@neptunus.(none)2006-04-261-19/+107
| |\ \
| | * | Bug#17208 SSL: client does not verify server certificatemsvensson@neptunus.(none)2006-04-181-2/+84
| | * | Fix up patchmsvensson@neptunus.(none)2006-04-121-67/+1
| | * | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-04-121-17/+89
| | |\ \
| | | * | Cleanup SSL implementationmsvensson@neptunus.(none)2006-03-101-17/+89
| * | | | Backport fix for mysql client not using SSl library directlymsvensson@neptunus.(none)2006-04-221-0/+21
| |/ / /
* | | | Final patch to remove the last of the OS2 support. brian@zim.(none)2006-04-151-9/+4
* | | | Update implementation of new function 'mysql_get_ssl_cipher' after reviewmsvensson@neptunus.(none)2006-04-101-1/+1
* | | | Merge bk-internal:/home/bk/mysql-5.1-newmsvensson@neptunus.(none)2006-04-071-0/+21
|\ \ \ \ | |/ / / |/| | |
| * | | Add new function mysql_get_ssl_cipher to libmysl and use it from client to av...msvensson@neptunus.(none)2006-04-071-0/+21
* | | | Moving mysql_get_server_version() from libmysql.c to client.c,bar@mysql.com2006-04-061-0/+30
* | | | client.c:bar@mysql.com2006-04-061-0/+3
|/ / /
* | | Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"monty@mysql.com2006-03-271-6/+0
* | | Make usage of the MYSQL struct in shared libraries compatible with MySQL 5.0....monty@mysql.com2006-03-231-2/+11
|/ /
* | Fixes to embedded server to be able to run tests with itmonty@mysql.com2006-02-241-4/+5
* | Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719msvensson@neptunus.(none)2006-01-301-17/+18
|\ \
| * | Bug #15719 MYSQL_OPT_RECONNECT option is modified by mysql_real_connectmsvensson@neptunus.(none)2006-01-261-17/+18
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@serg.mylan2006-01-161-1/+1
|\ \ \ | |/ / |/| |
| * | mergedserg@serg.mylan2006-01-031-1/+1
| |\ \
| | * | many warnings (practically safe but annoying) correctedserg@serg.mylan2006-01-031-1/+1
* | | | Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clauseanozdrin@mysql.com2006-01-112-1/+58
|/ / /
* | | Merge mysql.com:/home/alexi/dev/mysql-4.1-12440aivanov@mysql.com2005-12-151-6/+22
|\ \ \ | |/ / |/| / | |/
| * Fixed BUG #12440: "Incorrect processing of time values containingaivanov@mysql.com2005-12-151-6/+22
* | Fix value returned by mysql_warning_count() after fetching a preparedjimw@mysql.com2005-12-061-1/+1
* | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2005-11-251-1/+6
|\ \ | |/
| * Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabledgluh@eagle.intranet.mysql.r18.ru2005-11-211-1/+5
* | Improved testing of ssl and compressionmsvensson@neptunus.(none)2005-10-041-1/+4
* | Added option --valgrind-mysqltest to mysql-test-runmonty@mishka.mysql.fi2005-09-141-2/+9
* | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-09-121-1/+1
|\ \ | |/
| * Fixes bug #5588. Additions after merge from 4.0.SergeyV@selena.2005-09-071-1/+1
* | Merge mysql.com:/home/jimw/my/mysql-5.0-11787jimw@mysql.com2005-09-031-0/+3
|\ \
| * | Make it possible to change reconnect setting withjimw@mysql.com2005-07-061-0/+3
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-151-2/+3
|\ \ \ | | |/ | |/|
| * | Fix mysql_info() returning bad data in the results of a multi-statementjimw@mysql.com2005-08-101-2/+3