summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/hf/work/mysql-4.1.mrgunknown2006-07-188-32/+66
|\
| * Merge bk@192.168.21.1:mysql-4.1unknown2006-07-138-48/+74
| |\
| | * bug #16017 (memory leaks in embedded server)unknown2006-06-018-48/+74
* | | Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461unknown2006-07-151-1/+1
|\ \ \
| * | | ndb - (4.1) trivial fix to error.log (wday=0 was printed as "x")unknown2006-07-111-1/+1
* | | | 4.1 -> 5.0 mergeunknown2006-07-141-3/+2
* | | | Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-07-1419-137/+243
|\ \ \ \
| * | | | 4.1 -> 5.0 merge fixesunknown2006-07-145-29/+14
| * | | | 4.1 -> 5.0 mergeunknown2006-07-1319-124/+245
| |\ \ \ \
| | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-132-4/+9
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-4.1unknown2006-07-121-3/+5
| | | |\ \ \
| | | * \ \ \ Merge cmiller@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-123-2/+14
| | | |\ \ \ \
| | | * \ \ \ \ Merge zippy.(none):/home/cmiller/work/mysql/mysql-4.0__bug19006unknown2006-07-111-1/+4
| | | |\ \ \ \ \
| | | | * | | | | Add a more reliable "getconf" test for Linuxthreads. The later trees should ...unknown2006-07-071-6/+15
| | | | * | | | | Bug#19006: 4.0 valgrind problems (in test func_str)unknown2006-07-014-3/+22
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2006-07-1355-141/+2708
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-113-2/+14
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | ndb - bug#20847: non-debug compile fixunknown2006-07-101-0/+4
| | | * | | | | | Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my41unknown2006-07-1045-102/+2217
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-1030-64/+365
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-bug19835unknown2006-07-081-0/+3
| | | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-bug17877unknown2006-07-086-7/+98
| | | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-bug14400unknown2006-07-082-9/+21
| | | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-bug11824unknown2006-07-082-6/+35
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-075-1/+47
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | Bugs#17647: Trouble with "create database"unknown2006-05-045-1/+47
| | | | | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-076-7/+75
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | A fix and a test case for Bug#19399 "res 'Lost Connection' when unknown2006-07-066-7/+75
| | | | | * | | | | | | | | | | | Merge jonas@perch:src/mysql-4.1unknown2006-07-061-5/+8
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-061-5/+8
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2006-07-061-5/+8
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | \ \ \ \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-067-29/+78
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2006-06-302-13/+42
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-06-305-16/+36
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2006-06-291-0/+1
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-06-291-1/+1
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|_|/ / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2006-06-284-16/+35
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-064-8/+86
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-0513-30/+1766
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2006-07-1355-204/+1016
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | Bug#20432: mysql client interprets commands in commentsunknown2006-07-133-1/+34
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Bug#20729: Bad date_format() call makes mysql server crashunknown2006-07-113-2/+14
| | * | | | | | | | | | | | | | | | | | | | | | | Fix for bug #15977 (switch ordering of DISABLE KEYS/LOCK TABLE in mysqldump)unknown2006-06-212-62/+47
* | | | | | | | | | | | | | | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-07-143-2/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Bug#21014: Segmentation fault of mysqldump on viewunknown2006-07-143-2/+88
* | | | | | | | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-07-136-19/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-07-131-11/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | Bug #19779: mysql_explain_log documentation is outdated.unknown2006-07-131-11/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0unknown2006-07-135-8/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge zippy.(none):/home/cmiller/mysql-4.1_bug18470unknown2006-07-121-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \