summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintkaa@polly.local2007-01-252-0/+14
|\
| * Merge polly.local:/tmp/maint/bug6774/my51-bug6774kaa@polly.local2007-01-242-0/+14
| |\
| | * Merge polly.local:/tmp/maint/bug6774/my50-bug6774kaa@polly.local2007-01-242-0/+14
| | |\
| | | * Added a test case for bug #6774 "Replication fails with Wrong usage of DB GRA...kaa@polly.local2007-01-242-0/+14
* | | | Merge recycle.(none):/src/bug24496/my51-bug24496iggy@recycle.(none)2007-01-241-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge recycle.(none):/src/bug24496/my50-bug24496iggy@recycle.(none)2007-01-231-1/+1
| |\ \ \
| | * | | Bug#24496:Fresh install of mysql on windows has anonymous user with root access.iggy@recycle.(none)2007-01-231-1/+1
* | | | | Merge bk://localhost:5556tsmith@quadxeon.mysql.com2007-01-236-39/+74
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge siva.hindu.god:/home/tsmith/m/inno/jan20/50tsmith@siva.hindu.god2007-01-210-0/+0
| |\ \ \ \
| | * \ \ \ Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41tsmith@siva.hindu.god2007-01-210-0/+0
| | |\ \ \ \
| | | * | | | Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshotstsmith@siva.hindu.god2007-01-211-13/+16
| | * | | | | Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41tsmith@siva.hindu.god2007-01-210-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | Applied innodb-5.0-ss1230 snapshottsmith@siva.hindu.god2007-01-212-2/+2
| * | | | | | Merge siva.hindu.god:/home/tsmith/m/inno/jan20/50tsmith@siva.hindu.god2007-01-210-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge siva.hindu.god:/home/tsmith/m/inno/jan20/50tsmith@siva.hindu.god2007-01-210-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Applied innodb-5.1-ss1186tsmith@siva.hindu.god2007-01-216-39/+74
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintmtaylor@qualinost.(none)2007-01-2224-128/+340
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2007-01-2220-125/+269
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Import yaSSL version 1.5.8msvensson@neptunus.(none)2007-01-2217-124/+226
| | * | | | | | Add define for used type of third argument to 'accept' - Netware uses size_tmsvensson@neptunus.(none)2007-01-221-1/+4
| | * | | | | | gen_lex_hash does not need to link with odbc32*.libmsvensson@neptunus.(none)2007-01-221-1/+1
| | * | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2007-01-222-0/+39
| | |\ \ \ \ \ \
| | | * | | | | | Add test's from Matthias for assigning one variable from another using letmsvensson@neptunus.(none)2007-01-192-0/+39
| | * | | | | | | Merge ymer.(none):/usr/local/mysql/mysql-4.1-maintknielsen@ymer.(none)2007-01-221-0/+8
| | |\ \ \ \ \ \ \
| * | | | | | | | | after-merge fix.ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-01-221-3/+3
| * | | | | | | | | Merge mysql.com:/home/ram/work/b22026/b22026.5.0ramil/ram@ramil.myoffice.izhnet.ru2007-01-223-3/+63
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix for bug #22026: Warning when using IF statement and large unsigned bigintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-01-223-3/+63
| | |/ / / / / / / /
| * | | | | | | | | Merge ymer.(none):/usr/local/mysql/mysql-4.1-maintknielsen@ymer.(none)2007-01-221-0/+8
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Implement mysql-test-run.pl option to limit the number of saved coreknielsen@ymer.(none)2007-01-191-0/+8
* | | | | | | | | | Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maintmtaylor@qualinost.(none)2007-01-210-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maintmtaylor@qualinost.(none)2007-01-190-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Moving version-script to acinclude.m4mtaylor@qualinost.(none)2007-01-192-7/+8
| | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintmtaylor@qualinost.(none)2007-01-195-11/+52
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | * | | | | | | | | after merge fix.ramil/ram@mysql.com/myoffice.izhnet.ru2007-01-191-2/+2
| | | * | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintramil/ram@mysql.com/myoffice.izhnet.ru2007-01-194-9/+50
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintramil/ram@mysql.com/myoffice.izhnet.ru2007-01-184-9/+50
| | | | |\ \ \ \ \ \ \ \
* | | | | | | | | | | | | files are in storage/ndb in 5.1. fix merge from 5.0mtaylor@qualinost.(none)2007-01-191-2/+2
* | | | | | | | | | | | | We only want to do these things if we are building Ndb.mtaylor@qualinost.(none)2007-01-192-2/+11
* | | | | | | | | | | | | Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maintmtaylor@qualinost.(none)2007-01-192-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | / / / / / / / | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed the make distcheck problem. We only really need to create libndb.ver if...mtaylor@qualinost.(none)2007-01-193-9/+9
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | One final time making the path right.mtaylor@qualinost.(none)2007-01-191-2/+2
* | | | | | | | | | | Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maintmtaylor@qualinost.(none)2007-01-193-3/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Added libndb.ver to BUILT_SOURCES to force it to get removed during make dist...mtaylor@qualinost.(none)2007-01-192-0/+3
| * | | | | | | | | | missed storage in one more placemtaylor@qualinost.(none)2007-01-191-1/+1
| * | | | | | | | | | I cut and pasted in the wrong direction I think. We don't have storage until ...mtaylor@qualinost.(none)2007-01-191-1/+1
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintmtaylor@qualinost.(none)2007-01-1911-29/+71
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | Merge recycle.(none):/src/bug22807/my50-bug22807iggy@recycle.(none)2007-01-191-15/+13
| | |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Merge recycle.(none):/src/bug22807/my50-bug22807mtaylor@qualinost.(none)2007-01-192-2/+1
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintmtaylor@qualinost.(none)2007-01-194-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maintmtaylor@qualinost.(none)2007-01-181-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /