summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-messagepetr@mysql.com2006-02-183-7/+30
|\
| * Add a shift in the parser. Forgotten in the previous commit.petr@mysql.com2006-02-181-0/+1
| * Merge mysql.com:/home/cps/mysql/trees/5.0/mysql-5.0-virgin-debugpetr@mysql.com2006-02-183-7/+29
| |\
| | * fix Bug#12813 "Instance Manager: START/STOP INSTANCEpetr@mysql.com2006-02-143-7/+29
* | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newbrian@zim.tangent.org2006-02-171-9/+2
|\ \ \
| * | | Removing support for storage engines being loadable, will push featureto 5.2.brian@zim.tangent.org2006-02-171-9/+2
* | | | Fix results due to change in SHOW CREATE TABLE outputjimw@mysql.com2006-02-177-10/+10
* | | | Merge bk-internal:/home/bk/mysql-5.1-newjimw@mysql.com2006-02-171-1/+0
|\ \ \ \
| * | | | BUG#17385 Re-enabling test case as it passes now. Wrong results wereelliot@mysql.com2006-02-171-1/+0
* | | | | Merge mysql.com:/home/jimw/my/mysql-5.1-13883jimw@mysql.com2006-02-1721-71/+76
|\ \ \ \ \
| * | | | | Remove extra space in SHOW CREATE TABLE output. (Bug #13883)jimw@mysql.com2006-02-0221-72/+80
* | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-7955jimw@mysql.com2006-02-176-7/+75
|\ \ \ \ \ \
| * | | | | | Fix handling of "SET TRANSACTION ISOLATION LEVEL ...". (Bug #7955)jimw@mysql.com2005-11-026-7/+74
* | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-02-179-215/+326
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fix subselect results (there was a bad merge when subselect test was disabled)jimw@mysql.com2006-02-172-3/+4
| * | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-14676jimw@mysql.com2006-02-173-16/+37
| |\ \ \ \ \ \
| | * | | | | | Fix possible corruption of results from SUBSTRING_INDEX(). (Bug #14676)jimw@mysql.com2005-11-233-16/+37
| * | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0paul@snake-hub.snake.net2006-02-171-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2006-02-174-195/+285
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Mergeevgen@moonbone.local2006-02-164-195/+285
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix bug #15706 find_field_in_tables() returns field from outer selectevgen@moonbone.local2006-02-154-195/+285
* | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.1-17169jimw@mysql.com2006-02-173-14/+19
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Bug #17169: Partitions: out of memory if add partition and unique.jimw@mysql.com2006-02-163-14/+19
* | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-newmsvensson@neptunus.(none)2006-02-176-21/+79
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bug #17210 Create temp table call to ha_ndbcluster::create_handler_files caus...tomas@poseidon.ndb.mysql.com2006-02-176-21/+79
* | | | | | | | | | | | Fix after reviewmsvensson@neptunus.(none)2006-02-171-4/+4
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmsvensson@neptunus.(none)2006-02-171-54/+56
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Bug#17382 mysql-test-run mysqldump fails with mysqlimportmsvensson@neptunus.(none)2006-02-171-54/+56
* | | | | | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-newpaul@snake-hub.snake.net2006-02-172-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | configure.in:kent@mysql.com2006-02-171-1/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | Surprising change: "mysqld-max" is resurrected in 5.1, but in a common package.joerg@mysql.com2006-02-171-1/+2
* | | | | | | | | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0paul@snake-hub.snake.net2006-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | mysqlcheck.c:paul@snake-hub.snake.net2006-02-171-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-newpaul@snake-hub.snake.net2006-02-17132-464/+4633
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newbar@mysql.com2006-02-173-1/+44
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newbar@mysql.com2006-02-173-1/+44
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug#16234 XML: Crash if ExtractValue()bar@mysql.com2006-02-103-1/+44
| * | | | | | | | | | | | mergingholyfoot@mysql.com2006-02-175-5/+136
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | upgrade.result, upgrade.test:bar@mysql.com2006-02-172-0/+71
| | * | | | | | | | | | | client_priv.h:bar@mysql.com2006-02-171-1/+2
| | * | | | | | | | | | | mysqlcheck.c:bar@mysql.com2006-02-171-4/+60
| | * | | | | | | | | | | reported bugs and disabled corresponding teststomas@poseidon.ndb.mysql.com2006-02-171-0/+3
| * | | | | | | | | | | | WL#2645 (CHECK FOR UPGRADE)holyfoot@deer.(none)2006-02-173-8/+6
| * | | | | | | | | | | | Merging 5.0->5.1holyfoot@mysql.com2006-02-1712-8/+411
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0holyfoot@mysql.com2006-02-1712-7/+412
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | WL#2645 (CHECK TABLE FOR UPGRADE)holyfoot@deer.(none)2006-02-1712-7/+412
| | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| * | | | | | | | | | | | Merge mysql.com:/home/hf/work/mysql-5.0.cleanholyfoot@mysql.com2006-02-171-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | / / / / / / / / / | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2006-02-161-4/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | * | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2006-02-161-4/+5
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2006-02-161-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \