summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix after manual merge.unknown2006-07-292-1/+45
* Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_mergeunknown2006-07-297-14/+23
|\
| * Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0unknown2006-07-284-4/+9
| |\
| | * Makefile.am, configure.in:unknown2006-07-282-1/+6
| | * make_binary_distribution.sh:unknown2006-07-281-2/+2
| | * mysql.spec.sh:unknown2006-07-281-1/+1
| * | BUG#21206: memory corruption when too many cursors are opened at onceunknown2006-07-262-5/+9
| * | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-2414-25/+238
| |\ \
| | * \ Merge trift2.:/M41/clone-4.1unknown2006-07-2414-25/+238
| | |\ \
| * | | | Bug#21218 Test "mysqlbinlog" fails to execute another program on Windowsunknown2006-07-241-5/+6
* | | | | udf_example.c, udf.test, Makefile.am:unknown2006-07-293-70/+93
* | | | | Merge mysql.com:/Users/kent/mysql/bk/tmp_mergeunknown2006-07-280-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0unknown2006-07-243-3/+12
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | mwasmnlm, mwccnlm, mwldnlm:unknown2006-07-243-3/+12
| | * | Merge chilla.local:/home/mydev/mysql-4.0unknown2006-07-082-5/+17
| | |\ \
| | * \ \ Merge cmiller@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2006-07-071-1/+5
| | |\ \ \
| | | * \ \ Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/bug20216-4.0unknown2006-07-051-1/+5
| | | |\ \ \
* | | | \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-07-283-9/+9
|\ \ \ \ \ \ \
| * | | | | | | sql_select.cc:unknown2006-07-283-9/+9
* | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-07-2813-4874/+100
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert the change after null-merge.unknown2006-07-271-2/+2
| * | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-releaseunknown2006-07-271-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | BUG#21206: memory corruption when too many cursors are opened at onceunknown2006-07-273-7/+58
| * | | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-releaseunknown2006-07-2713-4874/+100
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | "mysql-test-run.pl" must write a "Logging:" line for the evaluation of RPM bu...unknown2006-07-251-0/+5
| | * | | | | | | | slave.cc:unknown2006-07-251-4/+4
| | * | | | | | | | mysqlmanager.vcproj:unknown2006-07-223-11/+35
| | * | | | | | | | Merge patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24)unknown2006-07-217-4/+31
| | * | | | | | | | A fix and a test case for Bug#21002 "Derived table not selecting from a unknown2006-07-199-4859/+61
* | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/global-41unknown2006-07-263-1/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | / / / / / / | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-233-1/+18
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix for #16327: invalid TIMESTAMP values retrievedunknown2006-05-173-1/+18
* | | | | | | | | | Merge mysql.com:/home/hf/work/mysql-4.1.mrgunknown2006-07-252-2/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge bk@192.168.21.1:mysql-4.1unknown2006-07-202-2/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | bug #19983 (mysql_client_test_embedded fails)unknown2006-06-022-2/+8
* | | | | | | | | | | Merge trift2.:/M41/clone-4.1unknown2006-07-2411-0/+213
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Bug #21135 Crash in test "func_time"unknown2006-07-192-24/+24
| * | | | | | | | | | Changes to make "sql/sql_locale.cc" compile + link on Windows:unknown2006-07-1712-109/+322
* | | | | | | | | | | Merge trift2.:/M41/push-1-4.1unknown2006-07-241-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | strings/strtod.c : Ensure the definition of "EOVERFLOW" is available.unknown2006-07-171-1/+1
* | | | | | | | | | | Merge trift2.:/M41/tmp_mergeunknown2006-07-241-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | mysql.spec.sh:unknown2006-07-191-0/+3
| * | | | | | | | | | Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1unknown2006-07-1817-25/+268
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Backporting Kostja's changes made for 5.0 into 4.1.unknown2006-07-182-111/+112
| * | | | | | | | | | | Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41unknown2006-07-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/M41/tmp_mergeunknown2006-07-241-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | / / / / / | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | mysql.spec.sh:unknown2006-07-151-1/+0
| * | | | | | | | | | | Increment the version number to 4.1.22, as 4.1.21 is cloned.unknown2006-07-141-2/+2
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge bk://anubis/mysql-5.0-enginesunknown2006-07-2110-191/+199
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | "BUG #18764: Delete conditions causing inconsistencies in Federated tables"unknown2006-07-183-4/+5
View Lorry Controller Status