summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-08-0915-106/+156
|\
| * Fix for bug #10055 "Using stored function with information_schema causes emptydlenev@mysql.com2005-08-0815-106/+157
* | ha_innodb.cc:heikki@hundin.mysql.fi2005-08-081-1/+1
* | Merge mysql.com:/home/jimw/my/mysql-5.0-11570jimw@mysql.com2005-08-082-3/+3
|\ \
| * | Replace host column when testing 'SHOW PROCESSLIST' since it isjimw@mysql.com2005-07-212-3/+3
* | | Fix error code in some tests because of mergejimw@mysql.com2005-08-083-3/+3
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-6080jimw@mysql.com2005-08-087-5/+26
|\ \ \
| * | | Fix error message when creating a non-string field with a displayjimw@mysql.com2005-08-057-5/+26
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-3094jimw@mysql.com2005-08-0830-41/+547
|\ \ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-08-084-2/+127
| |\ \ \ \
| | * | | | A fix and a test case for Bug#11909 "mysql_stmt_attr_set konstantin@mysql.com2005-08-084-2/+127
| * | | | | grant.result:bar@mysql.com2005-08-081-0/+3
| * | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b10892bar@mysql.com2005-08-082-4/+15
| |\ \ \ \ \
| | * \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-08-083-4/+18
| | |\ \ \ \ \
| | | * | | | | item.cc:bar@mysql.com2005-08-081-4/+6
| | | * | | | | grant.result, grant.test:bar@mysql.com2005-08-043-4/+16
| | * | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@rurik.mysql.com2005-08-073-6/+41
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-08-081-6/+7
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Fix for BUG#12082 (assert failure when the query fails to get a lock for reco...sergefp@mysql.com2005-07-311-6/+7
| * | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0igor@rurik.mysql.com2005-08-073-8/+105
| |\ \ \ \ \ \ \ \
| | * | | | | | | | subselect.result:igor@rurik.mysql.com2005-08-071-1/+0
| | * | | | | | | | Manual mergeigor@rurik.mysql.com2005-08-073-8/+106
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | subselect.result:igor@rurik.mysql.com2005-08-073-6/+41
| * | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1-4100ingo@mysql.com2005-08-083-0/+69
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-08-073-3/+11
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-08-075-5/+40
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Bug#9459 - deadlock with flush with lock, and lock table writeingo@mysql.com2005-08-053-0/+69
| * | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2005-08-0811-19/+89
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Post-merge fixessergefp@mysql.com2005-08-072-10/+10
| | * | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-08-0711-18/+88
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Manual mergesergefp@mysql.com2005-08-0713-14/+73
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | BUG#11869: part2: post-review fixes:sergefp@mysql.com2005-08-073-3/+11
| | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-08-075-5/+40
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-08-053-0/+23
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fix bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reducedevgen@moonbone.local2005-08-043-0/+23
| | | * | | | | | | | | BUG#11869:part 2: post-review fixes: merging into 5.0sergefp@mysql.com2005-08-079-19/+24
| | | * | | | | | | | | Manual mergesergefp@mysql.com2005-08-075-6/+40
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):sergefp@mysql.com2005-08-065-5/+40
| * | | | | | | | | | | Bug#10473 - Can't set 'key_buffer_size' system variable to ZEROingo@mysql.com2005-08-074-0/+21
| |/ / / / / / / / / /
| * | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releasekent@mysql.com2005-08-061-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releasekent@mysql.com2005-08-061-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | make_win_src_distribution.sh:kent@mysql.com2005-08-061-2/+2
| * | | | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2005-08-053-0/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | mysql_priv.h:igor@rurik.mysql.com2005-08-053-0/+109
* | | | | | | | | | | | | Always report row type of 'Fixed' for MEMORY tables. (Bug #3094)jimw@mysql.com2005-08-053-0/+19
|/ / / / / / / / / / / /
* | | | | | | | | | | | Ensure version is 5.0.12 (block the clone's "11" from the main tree).joerg@mysql.com2005-08-051-2/+2
* | | | | | | | | | | | Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0joerg@mysql.com2005-08-053-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | / / / / / / / / / / | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | testcase added to fix for bug #12281 (Geometry & trigger crash)hf@deer.(none)2005-08-052-0/+15
| * | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0hf@deer.(none)2005-08-051-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix for bug #12281 (Geometry: crash in trigger)hf@deer.(none)2005-08-051-0/+1