Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | After merge fixes | monty@mysql.com | 2004-12-31 | 64 | -249/+295 |
* | Merge with 4.1 | monty@mishka.local | 2004-12-22 | 395 | -25504/+11778 |
|\ | |||||
| * | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 | hf@deer.(none) | 2004-12-21 | 10 | -18993/+56 |
| |\ | |||||
| | * | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 | hf@deer.(none) | 2004-12-21 | 10 | -18993/+56 |
| | |\ | |||||
| | | * | Fix to perform correctly with charsets in embedded server | hf@deer.(none) | 2004-12-21 | 10 | -18993/+56 |
| * | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 | sergefp@mysql.com | 2004-12-21 | 4 | -11/+69 |
| |\ \ \ | |||||
| | * | | | Fix and testcase for BUG#6699 | sergefp@mysql.com | 2004-11-29 | 4 | -11/+69 |
| * | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 | sergefp@mysql.com | 2004-12-21 | 4 | -1/+69 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Fix for BUG#6825: When calculating Item_func_neg::max_length, add 1 for '-'. | sergefp@mysql.com | 2004-12-17 | 4 | -1/+69 |
| * | | | | automatically configure with shared memory transporter for ndb if functions a... | tomas@poseidon.ndb.mysql.com | 2004-12-20 | 2 | -22/+15 |
| * | | | | added config parameter Group on connection | tomas@poseidon.ndb.mysql.com | 2004-12-20 | 32 | -610/+1225 |
| * | | | | Fix assertion failure in client_test when linked with the embedded | konstantin@mysql.com | 2004-12-19 | 1 | -0/+1 |
| * | | | | mysql.cc: | paul@frost.snake.net | 2004-12-18 | 1 | -2/+2 |
| * | | | | fill_help_tables.sh: | paul@frost.snake.net | 2004-12-18 | 2 | -2/+3 |
| * | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 | guilhem@mysql.com | 2004-12-18 | 4 | -6/+17 |
| |\ \ \ \ | |||||
| | * | | | | Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling ... | guilhem@mysql.com | 2004-12-17 | 4 | -6/+17 |
| * | | | | | Fix test results | antony@ltantony.rdg.cyberkinetica.homeunix.net | 2004-12-18 | 1 | -8/+8 |
| * | | | | | Merge Bug#7391 from 4.0 | antony@ltantony.rdg.cyberkinetica.homeunix.net | 2004-12-18 | 5 | -11/+158 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0 | antony@ltantony.rdg.cyberkinetica.homeunix.net | 2004-12-18 | 1 | -1/+0 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix test | antony@ltantony.rdg.cyberkinetica.homeunix.net | 2004-12-18 | 1 | -1/+0 |
| | * | | | | | | Simplify code during review | monty@mysql.com | 2004-12-18 | 1 | -8/+2 |
| | |/ / / / / | |||||
| | * | | | | | Remove bogus lines | antony@ltantony.rdg.cyberkinetica.homeunix.net | 2004-12-18 | 1 | -7/+0 |
| | * | | | | | Bug#7391 - Multi-table UPDATE security regression | antony@ltantony.rdg.cyberkinetica.homeunix.net | 2004-12-18 | 3 | -0/+156 |
| | * | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0 | joerg@mysql.com | 2004-12-16 | 1 | -3/+11 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Have 'mysql-test-run' write a list of all failed tests at the end, if run wit... | joerg@mysql.com | 2004-12-16 | 1 | -3/+11 |
| | * | | | | | | Moved drop table statement to the end. | timour@mysql.com | 2004-12-16 | 2 | -1/+2 |
| | * | | | | | | Test for BUG#6054. The bug itsel is fixed by the fix for #5837. | timour@mysql.com | 2004-12-16 | 2 | -0/+15 |
| | |/ / / / / | |||||
| * | | | | | | Merge | georg@beethoven.local | 2004-12-18 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | fix for bug #7285: Disable start of embedded server when need to | georg@beethoven.local | 2004-12-15 | 1 | -1/+2 |
| * | | | | | | | my-innodb-heavy-4G.cnf.sh: | matt@booty.(none) | 2004-12-17 | 2 | -1/+2 |
| * | | | | | | | Delete files which were accidently created within the last push | mleich@mysql.com | 2004-12-17 | 5 | -6273/+0 |
| * | | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | mleich@mysql.com | 2004-12-17 | 3 | -2/+39 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | added TRACE to managemnt server | tomas@poseidon.ndb.mysql.com | 2004-12-17 | 3 | -2/+39 |
| * | | | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | mleich@mysql.com | 2004-12-17 | 11 | -0/+6291 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-12-17 | 19 | -688/+322 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-12-16 | 36 | -57/+73 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | |||||
| | * | | | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-12-16 | 23 | -87/+787 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-12-14 | 24 | -32/+212 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-12-13 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Small bug fix | mleich@mysql.com | 2004-12-13 | 6 | -0/+18 |
| | * | | | | | | | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-12-13 | 31 | -279/+637 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-12-13 | 67 | -2679/+3463 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-12-09 | 39 | -152/+731 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-12-07 | 138 | -800/+25288 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-12-02 | 105 | -904/+1575 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-11-29 | 18 | -526/+240 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-11-26 | 187 | -3099/+4206 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-11-19 | 42 | -128/+553 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-11-18 | 12 | -38/+83 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 | matthias@three.local.lan | 2004-11-17 | 20 | -77/+602 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |