summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51tsmith@siva.hindu.god2007-01-186-52/+88
|\
| * Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51tsmith@siva.hindu.god2007-01-186-52/+88
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2007-01-076-52/+88
| | |\
| | | * 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:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-123-5/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge mysql.com:/home/bk/MERGE/mysql-5.0-mergelars@black.(none)2006-12-081-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.0-rpllars@mysql.com/black.(none)2006-12-081-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Minor fixrafal@quant.(none)2006-12-081-1/+1
| | | * | | | | | | | | | | BUG#24507 (rpl_log.test crash slave):rafal@quant.(none)2006-12-081-0/+20
| * | | | | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-5.1-new-rpllars@black.(none)2006-12-082-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.cbell/Chuck@suse.vabb.com2006-12-072-4/+0
* | | | | | | | | | | | | | Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-buildmmj@tiger.mmj.dk2007-01-041-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | my_global.h:mmj@tiger.mmj.dk2007-01-041-0/+36
* | | | | | | | | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-312-5/+17
* | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-3111-9/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-3111-9/+39
* | | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-12-311-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1tomas@poseidon.2006-12-271-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: ALTE...mskold/marty@mysql.com/linux.site2006-12-191-0/+8
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-12-278-16/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-278-16/+8
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2006-12-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-enginessvoj@april.(none)2006-12-191-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | BUG#23255 - Missing version parameter in plugin declaration examplesvoj@mysql.com/april.(none)2006-12-051-2/+2
* | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \