summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge alik.:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@alik.2006-11-075-13/+1025
|\
| * Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-11-041-2/+2
| |\
| | * Updates for abi_checkmsvensson@neptunus.(none)2006-11-041-2/+2
| * | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-11-032-16/+10
| |\ \ | | |/
| | * 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
| | | | | |\ \
| | * | | | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimedlenev@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
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-10-201-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 bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-11-025-13/+1031
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Disable abi_check in 5.1 for the momentmsvensson@shellback.(none)2006-10-271-1/+1
| | * | | | | | | | | | | Update for 5.1msvensson@neptunus.(none)2006-10-261-51/+46
| | * | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-10-262-337/+10
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Bug#23427 incompatible ABI change in 5.0.26?msvensson@neptunus.(none)2006-10-262-337/+10
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@neptunus.(none)2006-10-253-2/+1331
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-10-243-2/+1331
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | 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 bk-internal.mysql.com:/home/bk/mysql-5.1-mainttsmith@maint1.mysql.com2006-10-241-6/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-10-241-6/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/emergency/mysql-5.0.26a-releasecmiller@zippy.cornsilk.net2006-10-201-6/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | Bug #23427: incompatible ABI change in 5.0.26?cmiller@zippy.cornsilk.net2006-10-201-6/+0
| | * | | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-10-232-7/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016cmiller@zippy.cornsilk.net2006-10-171-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | 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 bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-10-171-6/+28
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug11655/my51-bug11655kaa@polly.local2006-10-121-1/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug11655/my50-bug11655kaa@polly.local2006-10-111-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 naruto.:C:/cpp/bug21811/my51-bug21811Kristofer.Pettersson@naruto.2006-10-111-5/+15
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | BUG#21811 Odd casting with date + INTERVAL arithmeticKristofer.Pettersson@naruto.2006-10-111-5/+15
| | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-10-062-4/+14
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / | | | | | |/| | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimepetr/cps@outpost.site2006-11-061-0/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191petr/cps@owlet.local2006-11-011-0/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191petr/cps@mysql.com/owlet.local2006-11-011-0/+32
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |