summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* corrected automerge errorunknown2005-02-0326-122/+75
|\
| * Merge mysql.com:/data0/mysqldev/my/mysql-4.1unknown2005-02-0219-56/+67
| |\
| * \ Merge mysql.com:/data0/mysqldev/my/mysql-4.1unknown2005-02-022-9/+19
| |\ \
| * \ \ Merge mysql.com:/data0/mysqldev/my/mysql-4.1unknown2005-02-029-30/+45
| |\ \ \
| * | | | fix linkerror on sol9x86unknown2005-02-021-0/+9
| * | | | Merge production:my/mysql-4.1-buildunknown2005-02-023-8/+11
| |\ \ \ \
| * \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-0227-121/+81
| |\ \ \ \ \
| | * | | | | backported configure flag from 5.0unknown2005-02-024-2/+27
| | * | | | | cleanup and streamlining of thread create/exit in ndbunknown2005-02-0124-120/+55
* | | | | | | After merge fixesunknown2005-02-034-27/+22
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-0356-179/+461
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 4.1 -> 5.0 mergeunknown2005-02-0354-143/+471
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Use -DUNIV_DEBUG (extra debugging for InnoDB) when configuring with --debug=fullunknown2005-02-021-2/+2
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-0218-54/+65
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-029-30/+45
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Fixed during review of new pulled codeunknown2005-02-023-8/+18
| | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-0215-46/+47
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Proper fix for comparision with ' 'unknown2005-02-0115-46/+47
| | * | | | | | Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1unknown2005-02-021-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | - typo fix...unknown2005-02-021-1/+1
| | * | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-029-30/+45
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Fix merge of func_str tests (accidently duplicated a test).unknown2005-02-022-19/+14
| | | * | | | | | Merge fixes for #8248, #5569.unknown2005-02-027-14/+29
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge mysql.com:/home/jimw/my/mysql-4.0-cleanunknown2005-02-011-2/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge bk-internal:/home/bk/mysql-4.0unknown2005-02-011-2/+0
| | | | | |\ \ \ \ \
| | | | * | | | | | | Fix QUOTE() to not reuse the input field for output, which resulted inunknown2005-02-014-10/+18
| | | | |/ / / / / /
| | | | * | | | | | Merge mysql.com:/home/jimw/my/mysql-4.0-5569unknown2005-02-013-4/+5
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Always call vio_in_addr() so that thd->remote isunknown2005-01-253-4/+5
| | | * | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-8207unknown2005-02-021-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Add 'debug' to mysqladmin --help output. (Bug #8207)unknown2005-01-311-0/+1
| | | * | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1unknown2005-02-021-4/+8
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Make sure mysql_client_test and embedded test clients get added tounknown2005-02-011-4/+8
| | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | * | | | | | | | | Merge mysql.com:/space/my/mysql-4.1unknown2005-02-021-8/+18
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Small Do-compile improvements:unknown2005-02-021-8/+18
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | configure.inunknown2005-02-023-8/+11
| | |/ / / / / / /
| | * | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-02-013-0/+51
| | |\ \ \ \ \ \ \
| | | * | | | | | | func_str.result, func_str.test:unknown2005-02-013-0/+51
| | | |/ / / / / /
| | * | | | | | | ndb - backup fix, found on powermacg4unknown2005-02-021-1/+1
| | * | | | | | | Merge hundin.mysql.fi:/home/heikki/mysql-4.0unknown2005-02-020-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | eval0eval.ic:unknown2005-02-021-2/+0
| | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge hundin.mysql.fi:/home/heikki/mysql-4.0unknown2005-02-020-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | rem0rec.ic:unknown2005-02-021-14/+14
| | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-02-011-6/+0
| | | |\ \ \ \ \
| | | | * | | | | Remove #if 0 as this only confuses the code withing adding anythingunknown2005-02-011-6/+0
| | * | | | | | | Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-0226-48/+259
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-012-5/+14
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ mergingunknown2005-02-010-0/+0
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | after merge fix up:unknown2005-02-011-3/+3
| | | | |\ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | | * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-01-3113-31/+220
| | | | | |\ \ \ \ \
| | | | | * | | | | | A fix (bug #6000: No "@%"-accounts after install).unknown2005-01-281-8/+10
View Lorry Controller Status