summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfootunknown2006-08-0814-157/+261
|\
| * 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
| | * | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-enginesunknown2006-07-183-67/+119
| | |\ \ \ \ \
| | | * | | | | "BUG #18764: Delete conditions causing inconsistencies in Federated tables"unknown2006-07-173-66/+118
| | * | | | | | Merge bk-internal:/home/bk/mysql-5.0-enginesunknown2006-07-185-2/+38
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0-enginesunknown2006-07-115-2/+38
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug #17766: The server accepts to create MERGE tables which cannot workunknown2006-07-115-2/+38
| | * | | | | | | | Bug #17608: String literals lost during INSERT query on FEDERATED tableunknown2006-07-125-133/+52
* | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-new-maintunknown2006-08-044-177/+89
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.1-new-maintunknown2006-08-031-1/+2
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge rama.(none):/home/jimw/my/mysql-5.1-17122unknown2006-08-031-1/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug #17122: myisam_ftdump requires write access to files although only reads ...unknown2006-07-211-1/+2
| * | | | | | | | | | | | Use "--source" command instead of "source", makes mysql-test-run.pl dtecte th...unknown2006-08-031-2/+2
| * | | | | | | | | | | | Replace FEDERATED_EQ with STRING_WITH_LEN("=")unknown2006-08-031-1/+1
| * | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug20942unknown2006-08-032-173/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Bug#20942 ha_federated uses String::append(const char *s), strlen() on every ...unknown2006-08-022-174/+85
* | | | | | | | | | | | | Manual merge resolve, part 6 of 6+unknown2006-08-031-7/+0
* | | | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-aunknown2006-08-032-39/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 5.0 -> 5.1 manual merge, part 5 of 5 (or more?)unknown2006-08-032-39/+45
* | | | | | | | | | | | | | 5.0 -> 5.1 manual merge, part 4 of 4 (or more?)unknown2006-08-031-1/+1
* | | | | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-cunknown2006-08-036-3/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Finish the merge of the patch for bug #15195 from 4.1 -> 5.0unknown2006-07-203-2/+12
| * | | | | | | | | | | | | Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes neededunknown2006-07-206-3/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-147-6/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | --{skip-}merge option added which allows the user to disable merge engine andunknown2006-07-147-6/+26
| | * | | | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-148-48/+74
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-bunknown2006-08-033-1/+246
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-releaseunknown2006-07-193-1/+246
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURIT...unknown2006-07-193-1/+246
* | | | | | | | | | | | | | | | 5.0 -> 5.1 manual merge, part 1 of 3 (or more?)unknown2006-08-032-3/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | manual merge, part 2/2unknown2006-07-191-1/+0
| * | | | | | | | | | | | | | Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-releaseunknown2006-07-193-35/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Bug# 20221- Dumping of multiple databases containing view(s) yields maleforme...unknown2006-07-173-3/+91
View Lorry Controller Status