summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal:/home/bk/mysql-5.1-newmsvensson@neptunus.(none)2006-04-071-0/+1
|\
| * Add new function mysql_get_ssl_cipher to libmysl and use it from client to av...msvensson@neptunus.(none)2006-04-071-0/+1
* | Implement --warning-mode in SETUP.sh. The value of thekonstantin@mysql.com2006-04-071-1/+1
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmsvensson@shellback.(none)2006-04-061-0/+1
|\ \ | |/ |/|
| * Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-04-041-0/+1
| |\
| | * Bug#17368 General log and slow query log don't workmsvensson@shellback.(none)2006-04-041-0/+1
| * | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-04-041-0/+15
| |\ \
* | \ \ Manual merge.knielsen@mysql.com2006-03-282-0/+8
|\ \ \ \
| * | | | Define USE_TLS when compiling libmysql.dll, to avoid crashing whenknielsen@mysql.com2006-03-222-0/+8
| | |_|/ | |/| |
* | | | Merge zim.(none):/home/ian/workspace/mysql-5.0ian@zim.(none)2006-03-271-0/+2
|\ \ \ \
| * \ \ \ Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2006-03-271-0/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"monty@mysql.com2006-03-271-0/+2
* | | | | Merge 192.168.0.100:mysql/mysql-5.0msvensson@neptunus.(none)2006-03-241-0/+15
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Fix type "enfif" -> "endif"msvensson@shellback.(none)2006-03-231-1/+1
| * | | Mergekent@mysql.com2006-03-231-0/+15
| |\ \ \
| | * | | config-win.h:kent@mysql.com2006-03-231-0/+15
| | * | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2006-03-231-4/+13
| | |\ \ \
* | | \ \ \ after merge fixbar@mysql.com2006-03-241-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | m_ctype.h:bar@mysql.com2006-03-231-3/+0
* | | | | | Merge mysql.com:/usr/home/bar/mysql-5.0bar@mysql.com2006-03-231-4/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | m_ctype.h:bar@mysql.com2006-03-231-1/+0
| * | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b15376bar@mysql.com2006-03-231-0/+14
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug#15375 Unassigned multibyte codes are brokenbar@mysql.com2005-12-121-4/+13
* | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newbar@mysql.com2006-03-231-0/+5
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/usr/home/bar/mysql-5.0bar@mysql.com2006-03-231-0/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b17374bar@mysql.com2006-03-231-0/+5
| | |\ \ \ \ \ | | | | |/ / / | | | |/| / / | | | |_|/ / | | |/| | |
| | | * | | Bug#17374: select ... like 'A%' operator fails to find value on columuns with...bar@mysql.com2006-03-201-0/+5
| | * | | | Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195msvensson@shellback.(none)2006-03-161-2/+2
| | |\ \ \ \
| | * \ \ \ \ Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2006-03-101-4/+24
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newtomas@poseidon.ndb.mysql.com2006-03-221-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | continued:tomas@poseidon.ndb.mysql.com2006-03-221-0/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Bug#11835 CREATE FUNCTION crashes servermsvensson@neptunus.(none)2006-03-211-9/+0
|/ / / / / /
* | | | | | Merge shellback.(none):/home/msvensson/mysql/bug18195/my51-bug18195msvensson@shellback.(none)2006-03-161-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195msvensson@shellback.(none)2006-03-161-2/+2
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Bug#18195 MySQL on Windows not built with YaSSL correctlymsvensson@shellback.(none)2006-03-141-2/+2
* | | | | | | Merge mysql.com:/home/mydev/mysql-5.1ingo@mysql.com2006-03-101-4/+24
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M51/mysql-5.1joerg@mysql.com2006-03-101-4/+24
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| | * | | | | Include the system header file "pthread.h" even in a non-threaded build.joerg@mysql.com2006-03-101-4/+24
| | |/ / / /
* | | | | | Merge mysql.com:/home/mydev/mysql-5.0-bug14980ingo@mysql.com2006-03-101-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge mysql.com:/home/mydev/mysql-4.1-bug14980ingo@mysql.com2006-03-101-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEXingo@mysql.com2006-03-101-1/+1
* | | | Mergekent@mysql.com2006-02-281-0/+1
|\ \ \ \
| * | | | config-win.h:kent@mysql.com2006-02-251-0/+1
* | | | | Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525dlenev@mysql.com2006-02-271-0/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Bug#17716 Slave crash in net_clear on qnxmsvensson@neptunus.(none)2006-02-271-0/+9
| * | | | Fixes to embedded server to be able to run tests with itmonty@mysql.com2006-02-241-3/+6
| * | | | Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_...msvensson@neptunus.(none)2006-02-211-1/+1
| |\ \ \ \
* | | | | | This patch cleans up two tests which were a bit fragile from other failing te...brian@zim.(none)2006-02-244-165/+1
* | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_...msvensson@neptunus.(none)2006-02-211-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_...msvensson@neptunus.(none)2006-02-171-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |