summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* After merge fixesmonty@mysql.com2004-12-3164-249/+295
* Merge with 4.1monty@mishka.local2004-12-22395-25504/+11778
|\
| * Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2004-12-2110-18993/+56
| |\
| | * Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2004-12-2110-18993/+56
| | |\
| | | * Fix to perform correctly with charsets in embedded serverhf@deer.(none)2004-12-2110-18993/+56
| * | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-12-214-11/+69
| |\ \ \
| | * | | Fix and testcase for BUG#6699sergefp@mysql.com2004-11-294-11/+69
| * | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-12-214-1/+69
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix for BUG#6825: When calculating Item_func_neg::max_length, add 1 for '-'.sergefp@mysql.com2004-12-174-1/+69
| * | | | automatically configure with shared memory transporter for ndb if functions a...tomas@poseidon.ndb.mysql.com2004-12-202-22/+15
| * | | | added config parameter Group on connectiontomas@poseidon.ndb.mysql.com2004-12-2032-610/+1225
| * | | | Fix assertion failure in client_test when linked with the embedded konstantin@mysql.com2004-12-191-0/+1
| * | | | mysql.cc:paul@frost.snake.net2004-12-181-2/+2
| * | | | fill_help_tables.sh:paul@frost.snake.net2004-12-182-2/+3
| * | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1guilhem@mysql.com2004-12-184-6/+17
| |\ \ \ \
| | * | | | Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling ...guilhem@mysql.com2004-12-174-6/+17
| * | | | | Fix test resultsantony@ltantony.rdg.cyberkinetica.homeunix.net2004-12-181-8/+8
| * | | | | Merge Bug#7391 from 4.0antony@ltantony.rdg.cyberkinetica.homeunix.net2004-12-185-11/+158
| |\ \ \ \ \
| | * \ \ \ \ Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0antony@ltantony.rdg.cyberkinetica.homeunix.net2004-12-181-1/+0
| | |\ \ \ \ \
| | | * | | | | Fix testantony@ltantony.rdg.cyberkinetica.homeunix.net2004-12-181-1/+0
| | * | | | | | Simplify code during reviewmonty@mysql.com2004-12-181-8/+2
| | |/ / / / /
| | * | | | | Remove bogus linesantony@ltantony.rdg.cyberkinetica.homeunix.net2004-12-181-7/+0
| | * | | | | Bug#7391 - Multi-table UPDATE security regressionantony@ltantony.rdg.cyberkinetica.homeunix.net2004-12-183-0/+156
| | * | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0joerg@mysql.com2004-12-161-3/+11
| | |\ \ \ \ \
| | | * | | | | Have 'mysql-test-run' write a list of all failed tests at the end, if run wit...joerg@mysql.com2004-12-161-3/+11
| | * | | | | | Moved drop table statement to the end.timour@mysql.com2004-12-162-1/+2
| | * | | | | | Test for BUG#6054. The bug itsel is fixed by the fix for #5837.timour@mysql.com2004-12-162-0/+15
| | |/ / / / /
| * | | | | | Mergegeorg@beethoven.local2004-12-181-1/+2
| |\ \ \ \ \ \
| | * | | | | | fix for bug #7285: Disable start of embedded server when need togeorg@beethoven.local2004-12-151-1/+2
| * | | | | | | my-innodb-heavy-4G.cnf.sh:matt@booty.(none)2004-12-172-1/+2
| * | | | | | | Delete files which were accidently created within the last pushmleich@mysql.com2004-12-175-6273/+0
| * | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1mleich@mysql.com2004-12-173-2/+39
| |\ \ \ \ \ \ \
| | * | | | | | | added TRACE to managemnt servertomas@poseidon.ndb.mysql.com2004-12-173-2/+39
| * | | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1mleich@mysql.com2004-12-1711-0/+6291
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-12-1719-688/+322
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-12-1636-57/+73
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-12-1623-87/+787
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-12-1424-32/+212
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-12-131-1/+4
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Small bug fixmleich@mysql.com2004-12-136-0/+18
| | * | | | | | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-12-1331-279/+637
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-12-1367-2679/+3463
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-12-0939-152/+731
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-12-07138-800/+25288
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-12-02105-904/+1575
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-11-2918-526/+240
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-11-26187-3099/+4206
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-11-1942-128/+553
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-11-1812-38/+83
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-11-1720-77/+602
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \