summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fixed automake problem in dbug/Makefile.amunknown2005-01-281-3/+1
* mergedunknown2005-01-268-26/+34
|\
| * Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1unknown2005-01-262-6/+5
| |\
| | * innobase/include/univ.iunknown2005-01-262-6/+5
| * | mergedunknown2005-01-256-18/+33
| |\ \ | | |/
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-255-18/+20
| | |\
| | | * Cleanups during reviewunknown2005-01-255-18/+20
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-255-16/+18
| | |\ \ | | | |/
| | | * Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-251-5/+5
| | | |\
| | | | * Fix for failing INSERT IGNORE in test ndb_insertunknown2005-01-251-5/+5
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-252-0/+16
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Add flags for Intel 64 bitunknown2005-01-252-0/+16
* | | | | change to Makefile.am per Serg's requestunknown2005-01-251-1/+1
* | | | | rem0rec.h:unknown2005-01-252-3/+3
* | | | | Some minor fixes.unknown2005-01-253-2/+9
* | | | | Mergeunknown2005-01-255-5/+40
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Some bug fixes and a feature add to mysql-test-rununknown2005-01-255-5/+40
| * | | | Merge 4.1 -> 5.0unknown2005-01-251-19/+6
| |\ \ \ \ | | |/ / /
* | | | | mergeunknown2005-01-253-10/+10
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-253-10/+10
| |\ \ \ \
| | * | | | ndb - Move mysql-test-run & testBackup into "basic suite"unknown2005-01-253-10/+10
* | | | | | Fix two typos in comments.unknown2005-01-252-2/+2
* | | | | | One more after merge fix of Jan Lindström's changeset in 4.1unknown2005-01-251-3/+3
* | | | | | After merge fixesunknown2005-01-252-20/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge hundin.mysql.fi:/home/marko/k/mysql-4.0unknown2005-01-251-1/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | InnoDB: Enable ut_ad() assertions in MySQL debug builds.unknown2005-01-251-1/+3
| * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-253-3/+25
| |\ \ \ \ \
| * \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-254-4/+471
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-2546-213/+260
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-243-36/+35
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-2456-349/+978
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-1932-97/+208
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-181-19/+6
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-19/+6
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-132-7/+4
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-1310-50/+104
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Take a shared record lock (LOCK_REC_NOT_GAP) for a matching record in the for...unknown2005-01-121-19/+6
* | | | | | | | | | | | | | | Makefile.am:unknown2005-01-251-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-257-34/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | InnoDB: Write status bits to MLOG_COMP_REC_INSERT entries.unknown2005-01-257-34/+125
* | | | | | | | | | | | | | | Merge gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261unknown2005-01-253-3/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-253-3/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Test case (bug #7261: Alter table loses temp table with lower_case_table_name...unknown2005-01-252-2/+23
| | * | | | | | | | | | | | | A fix (bug #7261: Alter table loses temp table with lower_case_table_names=2).unknown2005-01-211-1/+2
* | | | | | | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2005-01-252-52/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | backported ndb_mgm options from 5.0unknown2005-01-254-56/+63
* | | | | | | | | | | | | | | Mergeunknown2005-01-253-0/+460
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-2537-185/+206
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1unknown2005-01-241-14/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-243-0/+460
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \