summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-12-266-52/+88
|\
| * Merge polly.local:/tmp/maint/bug24117/my51-bug24117kaa@polly.local2006-12-191-8/+11
| |\
| | * Added copy_typelib() declaration to make ABI compatibility test happykaa@polly.local2006-12-191-8/+11
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintkaa@polly.local2006-12-181-0/+3
| |\ \
| | * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintkaa@polly.local2006-12-161-0/+3
| | |\ \
| | | * \ Merge polly.local:/tmp/maint/bug24117/my51-bug24117kaa@polly.local2006-12-151-0/+3
| | | |\ \ | | | | |/
| | | | * Merge polly.local:/tmp/maint/bug24117/my50-bug24117kaa@polly.local2006-12-151-0/+3
| | | | |\
| | | | | * Fix for bug #24117 "server crash on a FETCH with a cursor on a table which is...kaa@polly.local2006-12-141-0/+3
| * | | | | Merge maint1.mysql.com:/data/localhome/msvensson/mysql-5.0-maintmsvensson@maint1.mysql.com2006-12-181-13/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Change windows pthread_cond_timedwait to use an absolute time value msvensson@shellback.2006-12-181-6/+8
| * | | | | Add macro for retrieving sec part of "struct timespec"msvensson@shellback.2006-12-151-5/+7
| * | | | | include/my_pthread.h: Fix botched merge - add struct timespec and set_timesp...tsmith/tim@siva.hindu.god2006-12-141-2/+69
| * | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50tsmith/tim@siva.hindu.god2006-12-142-36/+1
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | BUG#24687 func_misc test fails on win64msvensson@shellback.2006-12-143-46/+70
| * | | | Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50tsmith/tim@siva.hindu.god2006-12-082-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Having MYSQL_VERSION_ID defined correctly made this KILL_QUERY enum item visi...cmiller@zippy.cornsilk.net2006-12-071-0/+1
| | * | | Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246jpipes@shakedown.(none)2006-12-071-1/+1
| | |\ \ \
| | | * | | Fix for Bug #20246 (enum mysql_enum_shutdown_level not well-defined in mysql_...jpipes@shakedown.(none)2006-12-061-1/+1
| | | * | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-11-282-7/+0
| | | |\ \ \
| | | | * | | ABI fixholyfoot/hf@mysql.com/deer.(none)2006-11-171-1/+0
| | | | * | | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-11-161-6/+0
| | | | |\ \ \
| | | * | \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-11-241-0/+32
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1petr/cps@outpost.site2006-11-101-0/+32
| | | | |\ \ \ \
| | | | | * \ \ \ Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1-runtimepetr/cps@outpost.site2006-11-061-0/+32
| | | | | |\ \ \ \
* | | | | | \ \ \ \ Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-2354-108/+56
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-2356-112/+59
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-12-045-22/+21
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-11-283-7/+10
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | WL #3031patg@radha.patg.net2006-12-211-1/+2
* | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1pgalbraith@bk-internal.mysql.com2006-12-092-12/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2006-12-042-12/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-11-293-4/+22
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-11-271-7/+7
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Rework my_getpagesize functionmsvensson@neptunus.(none)2006-11-231-7/+7
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2006-11-231-6/+6
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-11-131-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@neptunus.(none)2006-11-131-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Remove the tmp file produced when checking abimsvensson@neptunus.(none)2006-11-131-0/+1
| | | * | | | | | | | | | remove remnants of abi-check.icmsvensson@neptunus.(none)2006-11-101-914/+0
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-12-031-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | This finishes the work (someone) started to remove FIELD_ types and use the E...brian@zim.(none)2006-12-011-2/+2
* | | | | | | | | | | | | 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