summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-11-171-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/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 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
| |\ \ \
| | * | | Bug#20404: SHOW CREATE TABLE fails with Turkish Ibar@mysql.com/bar.intranet.mysql.r18.ru2006-10-301-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
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make --mem settable with environment variable MTR_MEM and make it possible to...msvensson@neptunus.(none)2006-11-072-0/+914
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@zippy.cornsilk.net2006-11-025-5/+963
| | |\ \ \ | | | |_|/ | | |/| |
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-enginesistruewing@chilla.local2006-10-112-9/+15
| | |\ \ \
* | | \ \ \ Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rtanozdrin/alik@alik.2006-11-075-6/+1015
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Updates for abi_checkmsvensson@neptunus.(none)2006-11-041-2/+2
| * | | | | Remove sql_state-h from list of include files. (Merge error from 4.1)msvensson@neptunus.(none)2006-11-031-1/+1
| * | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-11-032-17/+11
| |\ \ \ \ \
| | * \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@neptunus.(none)2006-11-012-17/+11
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Update the rules for abi_checkmsvensson@neptunus.(none)2006-10-272-504/+170
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2006-11-025-6/+1021
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-10-264-10/+25
| | |\ \ \ \ \
| | | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-mainttsmith/tim@siva.hindu.god2006-10-254-10/+25
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g50tsmith/tim@siva.hindu.god2006-10-244-10/+25
| | | | |\ \ \ \ \
| | * | | | | | | | Bug#23427 incompatible ABI change in 5.0.26?msvensson@neptunus.(none)2006-10-262-337/+10
| | |/ / / / / / /
| | * | | | | | | Update the reference file for mysql API/ABI for 5.0msvensson@neptunus.(none)2006-10-241-214/+266
| | * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@neptunus.(none)2006-10-243-2/+1279
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | / / / / | | | | |/ / / / | | | |/| | | |
| | | * | | | | WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaksmsvensson@neptunus.(none)2006-10-243-2/+1281
| | | * | | | | Add ATTRIBUTE_FORMAT specifier to _db_doprnt, which is used by DBUG_PRINTmsvensson@shellback.(none)2006-10-121-1/+2
| | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintkaa@polly.local2006-10-111-1/+13
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge polly.local:/tmp/maint/bug11655/my41-bug11655kaa@polly.local2006-10-111-1/+13
| | | | |\ \ \ \ \
| | * | | \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/emergency/mysql-5.0.26a-releasecmiller@zippy.cornsilk.net2006-10-201-6/+0
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Add ATTRIBUTE_FORMAT for _db_doprnt, it will catch problemsmsvensson@shellback.(none)2006-10-121-1/+2
| | * | | | | | | | | Merge polly.local:/tmp/maint/bug11655/my50-bug11655kaa@polly.local2006-10-121-1/+13
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug11655/my41-bug11655kaa@polly.local2006-10-111-1/+13
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Fixes a number of problems with time/datetime <-> string conversion functions:kaa@polly.local2006-10-041-1/+13
* | | | | | | | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimepetr/cps@outpost.site2006-11-061-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191petr/cps@mysql.com/owlet.local2006-11-011-0/+32
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix Bug #9191 "TIMESTAMP/from_unixtime() no longer accepts 2^31-1"petr/cps@mysql.com/owlet.local2006-11-011-0/+32
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimedlenev@mockturtle.local2006-11-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Small cleanup in code handling stored routines/table prelocking.dlenev@mockturtle.local2006-11-011-0/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-10-211-6/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0.27-releasekent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-10-211-6/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Bug #23427: incompatible ABI change in 5.0.26?cmiller@zippy.cornsilk.net2006-10-201-6/+0
* | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-10-201-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0gkodinov@dl145s.mysql.com2006-10-191-1/+6
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0-optgkodinov/kgeorge@macbook.gmz2006-10-171-1/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Bug #22367: Optimizer uses ref join type instead of eq_ref for simple join on gkodinov/kgeorge@macbook.gmz2006-10-161-1/+6
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0istruewing@chilla.local2006-10-192-9/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-10-112-9/+15
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug8283-oneistruewing@chilla.local2006-10-092-9/+15
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | / | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug8283istruewing@chilla.local2006-10-092-9/+15
| | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |