summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge abarkov@bk-internal:/home/bk/mysql-5.0unknown2005-10-1324-107/+156
|\
| * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-135-19/+41
| |\
| * | Merged from 4.1.unknown2005-10-132-23/+23
| * | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmpunknown2005-10-1324-107/+156
| |\ \
| | * \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-134-4/+13
| | |\ \
| | | * | Some Netware related fixes and fixes for Metrowerks compiler.unknown2005-10-134-4/+13
| | * | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-1340-150/+2664
| | |\ \ \
| | | * \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-releaseunknown2005-10-138-28/+2461
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-133-11/+2
| | | |\ \ \
| | | | * | | memcpy_overlap() replaced with memmove() during the merging.unknown2005-10-131-1/+1
| | | | * | | Merge mysql.com:/usr/home/ram/work/mysql-4.0unknown2005-10-132-10/+1
| | | | |\ \ \
| | | | | * | | memcpy_overlap() removed, as unknown2005-10-122-11/+1
| | | | | * | | Merge mysql.com:/space/my/mysql-4.0unknown2005-10-111-1/+1
| | | | | |\ \ \
| | | | | * \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-10-096-1/+38
| | | | | |\ \ \ \
| | | * | | \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-133-10/+45
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Bug#12476 Some big5 codes are still missing.unknown2005-10-053-10/+45
| | | | * | | | | | item_cmpfunc.cc:unknown2005-10-051-1/+1
| | | * | | | | | | Merge bk-internal:/home/bk/mysql-4.1unknown2005-10-126-0/+44
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1unknown2005-10-121-0/+1
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-6413unknown2005-10-121-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fix read past allocated buffer when parsing charsets file. (Bug #6413)unknown2005-10-111-1/+1
| | | * | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-12136unknown2005-10-121-0/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-8731bunknown2005-10-1211-99/+77
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fix wait_timeout (and kill) handling on Mac OS X by cleaning up howunknown2005-10-1111-99/+77
| | | * | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-13344unknown2005-10-123-0/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-13619unknown2005-10-123-1/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-133-3/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fix bug#13535 Incorrect result from SELECT statement after SHOW TABLE STATUSunknown2005-10-033-3/+29
* | | | | | | | | | | | | | | | | Merge abarkov@bk-internal:/home/bk/mysql-5.0unknown2005-10-135-19/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-135-19/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Bug #13461 Slave Cluster crashed on restart of two data nodes in seperate g...unknown2005-10-135-19/+41
* | | | | | | | | | | | | | | | | select.result, mysqldump-max.result:unknown2005-10-135-17/+23
* | | | | | | | | | | | | | | | | Merge abarkov@bk-internal:/home/bk/mysql-5.0unknown2005-10-1347-198/+471
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | type_binary.result, type_binary.test:unknown2005-10-1347-198/+471
* | | | | | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-137-27/+2455
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Mergeunknown2005-10-137-27/+2455
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | mysqlwatch.vcproj:unknown2005-10-112-47/+261
| | * | | | | | | | | | | | | | | | Many files:unknown2005-10-116-0/+2212
| | * | | | | | | | | | | | | | | | Makefile.am:unknown2005-10-101-1/+6
| | * | | | | | | | | | | | | | | | func_group.test:unknown2005-10-091-0/+2
* | | | | | | | | | | | | | | | | | Manual merge of bug fix #7672unknown2005-10-136-0/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Manual mergedunknown2005-10-136-0/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | select.test, sql_select.cc, sql_lex.cc, item.cc:unknown2005-10-134-5/+17
| | * | | | | | | | | | | | | | | Manual merge, fix for bug #7672unknown2005-10-125-0/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fix bug#7672 Unknown column error in order clauseunknown2005-10-096-1/+38
* | | | | | | | | | | | | | | | | A post-review fix (Bug#12736)unknown2005-10-131-0/+1
* | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-1310-1/+589
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmpunknown2005-10-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Tweak kill test to avoid spurious test failure on SCO OpenServer. (Bug #12136)unknown2005-09-201-0/+1
| * | | | | | | | | | | | | | | | | Mergeunknown2005-10-133-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | |
View Lorry Controller Status