summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-09-1215-125/+101
|\
| * Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-09-121-0/+9
| |\
| | * Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0kent@mysql.com2005-09-131-0/+9
| | |\
| | | * configure.in:kent@mysql.com2005-09-081-0/+9
| | | * Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-4.0hartmut@mysql.com2005-09-087-2/+29
| | | |\
| * | | \ Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-09-1211-48/+67
| |\ \ \ \ | | |/ / /
| | * | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1ndbdev@dl145b.mysql.com2005-09-122-5/+10
| | |\ \ \
| | | * | | Corrected construct of faked Node fail signals in ndb SignalSendertulin@dl145b.mysql.com2005-09-122-5/+10
| | * | | | Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1SergeyV@selena.2005-09-128-2/+33
| | |\ \ \ \
| | | * | | | Fixes bug #5588. Additions after merge from 4.0.SergeyV@selena.2005-09-075-4/+17
| | | * | | | Merge selena.:H:/MYSQL/src/#05588-mysql-4.0SergeyV@selena.2005-09-075-1/+19
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Fixes a problem with patch 1.2140, that prevented libmysqld SergeyV@selena.2005-09-061-0/+9
| | | | * | | Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.0SergeyV@selena.2005-09-066-2/+20
| | | | |\ \ \
| | | | | * | | Fixes bug #5588. vio_was_interrupted() function was added to detectSergeyV@selena.2005-08-306-2/+20
| | * | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1paul@kite-hub.kitebird.com2005-09-121-41/+24
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge kite-hub.kitebird.com:/tmp/merge-4.0paul@kite-hub.kitebird.com2005-09-121-41/+24
| | | |\ \ \ \ \ \
| | | | * | | | | | README:paul@kite-hub.kitebird.com2005-09-121-41/+24
| * | | | | | | | | Update test resultjimw@mysql.com2005-09-121-0/+2
| * | | | | | | | | Merge mysqldev@production.mysql.com:jimw/mysql-4.1-scojimw@mysql.com2005-09-123-75/+22
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | When first creating the ARZ file for an archive table, use "wb" as the mode forjimw@mysql.com2005-09-081-1/+1
| | * | | | | | | | Port to SCO OpenServer 6. May require running ./configure withjimw@mysql.com2005-09-072-74/+21
* | | | | | | | | | mysql-test-run.pl:kent@mysql.com2005-09-131-1/+1
* | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com2005-09-1349-131/+799
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merged from 4.1 to 5.0.jani@a193-229-222-105.elisa-laajakaista.fi2005-09-133-11/+11
| * | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2005-09-1312-28/+99
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1jani@a193-229-222-105.elisa-laajakaista.fi2005-09-1212-28/+99
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@mysql.com2005-09-126-15/+39
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.mysql.com2005-09-126-15/+39
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | | | * | | | | | | Review fixes since last pullmonty@mishka.mysql.com2005-09-126-15/+39
| | | * | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@mysql.com2005-09-126-14/+67
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@mysql.com2005-09-126-14/+67
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Fix for bug #6008: MySQL does not create warnings when creating database and ...gluh@eagle.intranet.mysql.r18.ru2005-09-126-14/+67
| | | | | |/ / / / / / /
| | | * | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@eel.(none)2005-09-129-88/+378
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@eel.(none)2005-09-122-6/+6
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | * | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@eel.(none)2005-09-129-88/+378
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@eel.(none)2005-09-111-3/+0
| | | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@eel.(none)2005-09-102-0/+20
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@eel.(none)2005-09-099-88/+378
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ Merge eel.(none):/home/jonas/src/mysql-4.1jonas@eel.(none)2005-09-099-88/+378
| | | | | | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Adding comment for force manual merge 5.0 -> wl1012jmiller@mysql.com2005-09-127-0/+7
| * | | | | | | | | | | | | | | | BUG#12943 - post-merge fixtimour@mysql.com2005-09-122-0/+4
| * | | | | | | | | | | | | | | | Merge mysql.com:/home/timka/mysql/src/5.0-virgintimour@mysql.com2005-09-124-2/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Fix for BUG#12943.timour@mysql.com2005-09-104-2/+54
| * | | | | | | | | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0bar@mysql.com2005-09-125-2/+192
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Many files:bar@mysql.com2005-09-125-2/+192
| * | | | | | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tulin@dl145c.mysql.com2005-09-124-6/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | removed a few aborts from mgmapitulin@dl145c.mysql.com2005-09-122-4/+1
| | * | | | | | | | | | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1lars@mysql.com2005-09-122-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Reverted old fix with sync_slave_with_master and added a replace commandslars@mysql.com2005-09-122-3/+4
| | * | | | | | | | | | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1lars@mysql.com2005-09-111-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |