summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge rama.(none):/home/jimw/my/tmp_mergejimw@rama.(none)2006-07-282-4/+16
|\
| * Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-182-4/+16
| |\
| | * Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-132-4/+16
| | |\
| | | * bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-012-4/+16
| * | | Merge bodhi.local:/opt/local/work/mysql-5.0-rootkostja@bodhi.local2006-07-071-1/+10
| |\ \ \
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimedlenev@mysql.com2006-07-061-1/+10
| | |\ \ \
| * | \ \ \ Merge mysqldev@production:my/mysql-5.0-releaseknielsen@rt.int.sifira.dk2006-07-041-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | my_sys.h:kent@mysql.com2006-07-011-1/+1
| | * | | | mysql.spec.sh:kent@mysql.com2006-06-301-2/+2
| | * | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpllars@mysql.com2006-06-291-0/+8
| | |\ \ \ \
* | | \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1tsmith/tim@siva.hindu.god2006-07-154-5/+13
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-132-3/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | After merge fixesmonty@mysql.com2006-06-301-1/+0
| | * | | | | | Merge mysql.com:/home/my/mysql-4.1monty@mysql.com2006-06-301-2/+2
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Fixed include file usagemonty@mysql.com2006-06-301-2/+2
| | * | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0lars@mysql.com2006-06-291-0/+8
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| | * | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@mysql.com2006-06-281-0/+1
| | |\ \ \ \ \
| | | * \ \ \ \ mergingholyfoot@mysql.com2006-06-261-0/+1
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-07-132-1/+2
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rplmkindahl@dl145k.mysql.com2006-07-111-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Correcting signature for my_strndup to be able to build on Windowsmats@romeo.(none)2006-07-071-2/+2
| * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimedlenev@jabberwock.site2006-07-071-1/+10
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/dlenev/mysql-5.0-bg18437-3dlenev@mysql.com2006-07-021-1/+10
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | / / | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | Fix for bug#18437 "Wrong values inserted with a before update trigger ondlenev@mysql.com2006-07-021-1/+10
| | | | |_|/ / / / | | | |/| | | | |
* | | | | | | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1cmiller@zippy.(none)2006-07-102-1/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge chilla.local:/home/mydev/mysql-5.1--mainingo/mydev@chilla.local2006-07-081-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge chilla.local:/home/mydev/mysql-5.0-ateamingo@chilla.local2006-07-061-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge mysql.com:/home/mydev/mysql-4.1-bug14400ingo@mysql.com2006-07-051-0/+1
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | bug #20318 (ctype_ucs2_def test fails with embedded)holyfoot@deer.(none)2006-06-191-0/+1
| | | | * | | | | Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEXigor@rurik.mysql.com2006-05-302-2/+1
| | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEXigor@rurik.mysql.com2006-05-272-0/+2
| * | | | | | | Merge bodhi.netgear:/opt/local/work/tmp_mergekonstantin@bodhi.netgear2006-07-061-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Fix compilation failures on Windows caused by the patch for Bug#17199.konstantin@mysql.com2006-06-271-1/+1
| | | |_|/ / | | |/| | |
* | | | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1cmiller@zippy.(none)2006-07-0513-339/+236
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars@dl145k.mysql.com2006-06-281-0/+8
| |\ \ \ \ \
| | * \ \ \ \ Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpllars@mysql.com2006-06-281-0/+8
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Fixing BUG#17719 "Delete of binlog files fails on Windows"aivanov@mysql.com2006-06-281-0/+8
| | | | |/ / | | | |/| |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1konstantin@mysql.com2006-06-261-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | manual mergeandrey@lmy004.2006-06-201-1/+1
| | |\ \ \ \
| | | * | | | Reorganize, physically the events codeandrey@lmy004.2006-06-081-1/+1
| * | | | | | Merge mysql.com:/home/emurphy/src/bk-clean/tmp_mergeelliot@mysql.com2006-06-252-1/+30
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"jani@ua141d10.elisa.omakaista.fi2006-06-211-0/+9
| | * | | | | Fix for Bug#18246 "compilation error with tcp_wrapper"jani@ua141d10.elisa.omakaista.fi2006-06-212-1/+20
| | | |_|/ / | | |/| | |
| | * | | | Merge april:devel/BitKeeper/mysql-5.0-enginessvoj@may.pils.ru2006-06-191-0/+3
| | |\ \ \ \
| * | | | | | Build fixes for Windows, Solaris, HPUX, AIX.knielsen@mysql.com2006-06-241-0/+4
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2006-06-212-1/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge mysql.com:/home/alik/MySQL/devel/5.1-treeanozdrin@booka.site2006-06-201-1/+1
| | |\ \ \ \ \
| | | * | | | | Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().anozdrin@mysql.com2006-06-191-1/+1
| | * | | | | | Merge april:devel/BitKeeper/mysql-5.0-enginessvoj@may.pils.ru2006-06-191-0/+3
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Fixed windows compilation failure introduced by fix for BUG#12982.svoj@may.pils.ru2006-06-151-1/+1