summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1mskold/marty@linux.site2006-12-032-12/+12
|\
| * Makefile.am:kent@mysql.com/kent-amd64.(none)2006-12-031-1/+2
| * Merge mysql.com:/home/kent/bk/mysql-5.0-buildkent@kent-amd64.(none)2006-12-021-11/+10
| |\
| | * mysql_install_db.sh:kent@mysql.com/kent-amd64.(none)2006-12-021-12/+11
| * | fix build failure introduced by 5.1-marvel mergedf@kahlann.erinye.com2006-12-011-1/+1
* | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1mskold/marty@linux.site2006-12-015-11/+11
|\ \ \ | |/ /
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2006-11-305-11/+11
| |\ \
| | * \ Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2006-11-301-2/+3
| | |\ \ | | | |/
| | | * Fixed portability issue in my_thr_init.c (was added in my last push)monty@mysql.com/narttu.mysql.fi2006-11-302-4/+5
| | * | Fixed compiler warnings (Mostly VC++):monty@mysql.com/narttu.mysql.fi2006-11-302-3/+3
| | * | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2006-11-292-6/+5
| | |\ \ | | | |/
| | | * Ignore some generated filesmonty@mysql.com/narttu.mysql.fi2006-11-291-2/+1
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-11-291-4/+4
| | | |\
| | | | * Increased heap max length to > 4G for 64 bit machines monty@mysql.com/nosik.monty.fi2006-11-281-4/+4
| | | * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2006-11-271-0/+5
| | | |\ \
| | | * \ \ Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-11-271-1/+2
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-11-171-0/+2
| | | |\ \ \
* | | | \ \ \ Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1mskold/marty@linux.site2006-11-307-11/+55
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-11-301-0/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-292-0/+7
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-293-10/+26
| | |\ \ \ \ \ \
| | * | | | | | | Make IM compiled on Win32: add pthread_join() impl.anozdrin/alik@booka.2006-11-221-0/+3
| * | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-11-292-0/+7
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-11-291-0/+5
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-11-281-0/+5
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0kent@kent-amd64.(none)2006-11-271-0/+5
| | | | |\ \ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | |
| | | | | * | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releasekent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-11-271-0/+5
| | | | | |\ \ \ \ \ | | | | | | |_|/ / / | | | | | |/| | | |
| | | | | | * | | | Add define for my_getpagesize to 8192(reworked in 5.0)msvensson@neptunus.(none)2006-11-231-0/+5
| | * | | | | | | | Merge bk-internal:/home/bk/mysql-5.1gkodinov@dl145s.mysql.com2006-11-281-0/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@deer.(none)2006-11-171-0/+2
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Merge mysql.com:/home/hf/work/mysql-5.0.cleanholyfoot/hf@deer.(none)2006-11-081-0/+2
| | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | |
| | | | | * | | | | bug #19491 (5.0-related additional fixes)holyfoot/hf@mysql.com/deer.(none)2006-11-061-0/+2
| | | | * | | | | | Merge mysql.com:/home/hf/work/current_stmt/my50-current_stmtholyfoot/hf@deer.(none)2006-10-241-6/+0
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmtholyfoot/hf@mysql.com/deer.(none)2006-10-241-6/+0
| | | | | |\ \ \ \ \
| | | | | | * | | | | Bug #23427 (incompatible ABI change)holyfoot/hf@mysql.com/deer.(none)2006-10-241-6/+0
| * | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-11-282-4/+20
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Removed compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-271-3/+18
| | * | | | | | | | | Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-271-1/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | / | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | Added some missing DBUG_RETURNmonty@mysql.com/nosik.monty.fi2006-11-231-1/+2
| | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Merge mysql.com:/home/bkroot/mysql-5.0-rpllars@mysql.com/black.(none)2006-11-131-6/+6
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | | * | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145h.mysql.com2006-11-071-6/+6
| | | | |\ \ \ \ \
| | | * | \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-11-082-0/+914
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@neptunus.(none)2006-11-072-0/+914
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rtanozdrin/alik@alik.2006-11-075-6/+1015
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | * | | | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimepetr/cps@outpost.site2006-11-061-0/+32
| | | |\ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-11-221-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-5.1-new-rpllars@black.(none)2006-11-131-6/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | | * | | | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2006-11-071-6/+6
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge mysql.com:/usr/home/bar/mysql-5.0-rplbar@bar.intranet.mysql.r18.ru2006-11-031-6/+6
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / | | | | | |/| | | | / / / | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | |
| | | | | * | | | | | | Bug#20404: SHOW CREATE TABLE fails with Turkish Ibar@mysql.com/bar.intranet.mysql.r18.ru2006-10-301-6/+6
| | | | | | |_|_|_|/ / | | | | | |/| | | | |