summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-1/+1
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-1/+1
| |\
| | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-2/+1
* | | Merge mysql.com:/d2/hf/common/my41-commonholyfoot/hf@mysql.com/hfmain.(none)2007-01-031-0/+1
|\ \ \
| * | | warning count for embedded prepared statements addedholyfoot/hf@mysql.com/hfmain.(none)2007-01-031-0/+1
| * | | merging fixholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-2/+0
* | | | Merge mysql.com:/d2/hf/common/my41-commonholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-0/+4
|\ \ \ \ | |/ / /
| * | | merging fixholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-4/+4
| * | | embedded-server related fixesholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-0/+6
| * | | Merge bk@192.168.21.1:mysql-4.1-optholyfoot/hf@mysql.com/deer.(none)2006-12-082-1/+5
| |\ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1kostja@bodhi.local2006-11-291-5/+9
| |\ \ \ \
| * \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com/kent-amd64.(none)2006-11-271-5/+19
| |\ \ \ \ \
* | \ \ \ \ \ Merge mysql.com:/d2/hf/clean/my50-cleanholyfoot/hf@mysql.com/hfmain.(none)2006-12-312-1/+7
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-12-082-1/+7
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | several fixes to make tests pass in embedded-server modeholyfoot/hf@mysql.com/deer.(none)2006-11-131-0/+2
| | * | | | | | Merge mysql.com:/home/hf/work/embt/my41-embtholyfoot/hf@mysql.com/deer.(none)2006-11-132-1/+5
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | embedded-mode tests fixedholyfoot/hf@mysql.com/deer.(none)2006-11-132-1/+5
| | | |/ / / /
| | * | | | | Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmtholyfoot/hf@mysql.com/deer.(none)2006-10-241-1/+1
| | |\ \ \ \ \ | | | |/ / / /
* | | | | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-313-3/+3
* | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-236-12/+7
|/ / / / / /
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-11-293-6/+20
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2006-11-271-5/+18
| |\ \ \ \ \
| | * \ \ \ \ Merge mysql.com:/home/kent/bk/mysql-4.1kent@mysql.com/kent-amd64.(none)2006-11-271-5/+18
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | gen_rec.awk:kent@mysql.com/kent-amd64.(none)2006-11-271-5/+19
| * | | | | | Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-11-271-1/+1
| |\ \ \ \ \ \
| | * | | | | | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-201-1/+1
| | |/ / / / /
| * | | | | | Merge mysql.com:/home/hf/work/mysql-4.1-mrgholyfoot/hf@mysql.com/deer.(none)2006-11-161-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Bug #23427 (incompatible ABI change)holyfoot/hf@mysql.com/deer.(none)2006-10-241-5/+5
| | |/ / /
* | | | | Fix after manual merge: remove dead declaration.kroki/tomash@moonlight.intranet2006-11-171-1/+0
* | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383kroki/tomash@moonlight.intranet2006-11-171-7/+9
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | BUG#23383: mysql_affected_rows() returns different values thankroki/tomash@moonlight.intranet2006-11-171-5/+9
| |/ /
* | | Bug #23427: incompatible ABI change in 5.0.26?cmiller@zippy.cornsilk.net2006-10-201-1/+0
| |/ |/|
* | bug #16513 (no mysql_set_server_option in libmysqld.dll export)holyfoot/hf@mysql.com/deer.(none)2006-08-191-0/+1
* | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-251-2/+6
|\ \ | |/
| * Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-201-2/+6
| |\
| | * bug #19983 (mysql_client_test_embedded fails)holyfoot@deer.(none)2006-06-021-2/+6
* | | mergingholyfoot/hf@mysql.com/deer.(none)2006-07-182-16/+1
* | | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-183-16/+30
|\ \ \ | |/ /
| * | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-133-31/+37
| |\ \
| | * | bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-013-31/+37
| | |/
* | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-081-1/+1
|\ \ \ | |/ /
| * | WL#2928 Date Translation NREbar@mysql.com2006-07-041-1/+1
* | | mergingholyfoot@mysql.com2006-06-262-45/+10
|\ \ \ | |/ /
| * | bug #20318 (ctype_ucs2_def test fails with embedded)holyfoot@deer.(none)2006-06-192-45/+10
| |/
| * Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-12-271-0/+0
* | Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_initmsvensson@shellback.(none)2006-05-312-3/+3
* | Backport fix for mysql client not using SSl library directlymsvensson@neptunus.(none)2006-04-221-0/+1
* | compilation fixesserg@serg.mylan2006-03-061-29/+22
* | Fixes to embedded server to be able to run tests with itmonty@mysql.com2006-02-244-214/+462
* | Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clauseanozdrin@mysql.com2006-01-111-1/+1