Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge mysql.com:/home/dlenev/src/mysql-4.1-merges | dlenev@mysql.com | 2005-01-18 | 3 | -17/+5 |
|\ | |||||
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | dlenev@mysql.com | 2005-01-18 | 3 | -17/+5 |
| |\ | |||||
| | * | Cleanups in Makefile.ams | konstantin@mysql.com | 2005-01-18 | 3 | -17/+5 |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | dlenev@mysql.com | 2005-01-18 | 2 | -7/+7 |
|\ \ \ | |||||
| * \ \ | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 | bar@mysql.com | 2005-01-18 | 2 | -7/+7 |
| |\ \ \ | |||||
| | * | | | ps_7ndb.result, ps_6bdb.result: | bar@mysql.com | 2005-01-18 | 2 | -7/+7 |
* | | | | | Merge mysql.com:/home/dlenev/src/mysql-4.1-merges | dlenev@mysql.com | 2005-01-18 | 3 | -7/+22 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP | dlenev@brandersnatch.localdomain | 2005-01-18 | 2 | -0/+15 |
| * | | | Manual merge of fix for bug #7884 "Able to add invalid unique index on | dlenev@mysql.com | 2005-01-18 | 1 | -7/+7 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0 | dlenev@mysql.com | 2005-01-18 | 1 | -7/+7 |
| | |\ \ | |||||
| | | * | | Clean up in implementation of f_is_geom()/f_is_bitfield()/f_is_enum() | dlenev@mysql.com | 2005-01-18 | 1 | -7/+7 |
| | * | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0 | lenz@mysql.com | 2005-01-18 | 1 | -0/+3 |
| | |\ \ \ | |||||
* | | \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 | jani@ua141d10.elisa.omakaista.fi | 2005-01-18 | 3 | -11/+46 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Added possibility to use --error <name> instead of --error <number> | jani@ua141d10.elisa.omakaista.fi | 2005-01-18 | 3 | -11/+46 |
* | | | | | | After-merge clean-up | bar@mysql.com | 2005-01-18 | 10 | -47/+47 |
* | | | | | | merge | bar@mysql.com | 2005-01-18 | 2 | -3/+6 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | 1. Item now uses my_charset_bin by default, | bar@mysql.com | 2005-01-18 | 13 | -56/+59 |
* | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 | sergefp@mysql.com | 2005-01-18 | 5 | -76/+64 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 | tomas@poseidon.ndb.mysql.com | 2005-01-18 | 3 | -30/+19 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 | gluh@gluh.mysql.r18.ru | 2005-01-18 | 3 | -30/+19 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | bug #7981: SHOW GLOBAL STATUS crashes server(fix after review) | gluh@gluh.mysql.r18.ru | 2005-01-18 | 1 | -1/+0 |
| | | * | | | | | Fix for bug #7981: SHOW GLOBAL STATUS crashes server | gluh@gluh.mysql.r18.ru | 2005-01-18 | 3 | -30/+20 |
| * | | | | | | | compile error: moved inline | tomas@poseidon.ndb.mysql.com | 2005-01-18 | 1 | -45/+45 |
| |/ / / / / / | |||||
| * | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 | tomas@poseidon.ndb.mysql.com | 2005-01-18 | 1 | -1/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | compile bug fix | tomas@poseidon.ndb.mysql.com | 2005-01-18 | 1 | -1/+0 |
* | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 | sergefp@mysql.com | 2005-01-18 | 5 | -174/+187 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 | sergefp@mysql.com | 2005-01-18 | 5 | -174/+187 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Post-review fixes for the previous cset. No code behavior changes. | sergefp@mysql.com | 2005-01-18 | 1 | -3/+8 |
| | * | | | | | | | Fixes in opt_range.cc: ROR plan choice code | sergefp@mysql.com | 2005-01-17 | 5 | -176/+184 |
* | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 | guilhem@mysql.com | 2005-01-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge mysql.com:/home/kostja/work/mysql-4.1-root | konstantin@mysql.com | 2005-01-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | / / / / | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | * | | | | | | | Fix 'make distclean' goal. | konstantin@mysql.com | 2005-01-18 | 1 | -1/+1 |
| | * | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 | guilhem@mysql.com | 2005-01-18 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | | slave.cc: | guilhem@mysql.com | 2005-01-18 | 1 | -1/+2 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 | guilhem@mysql.com | 2005-01-18 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge mysql.com:/home/mysql_src/mysql-4.1-clean | guilhem@mysql.com | 2005-01-18 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 | guilhem@mysql.com | 2005-01-18 | 7 | -6/+41 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'": | guilhem@mysql.com | 2005-01-17 | 1 | -0/+5 |
* | | | | | | | | | compile error fix | tomas@poseidon.ndb.mysql.com | 2005-01-18 | 1 | -2/+2 |
* | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 | tomas@poseidon.ndb.mysql.com | 2005-01-18 | 20 | -41/+180 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 | lenz@mysql.com | 2005-01-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 | lenz@mysql.com | 2005-01-18 | 10 | -7/+52 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | * | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 | lenz@mysql.com | 2005-01-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 | lenz@mysql.com | 2005-01-17 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge mysql.com:/space/my/mysql-4.0 | lenz@mysql.com | 2005-01-17 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ | | | | | | |_|_|/ / / | | | | | |/| | | | | | |||||
| | | | | * | | | | | | - Enabled the handling of architecture extensions e.g. "-64bit" when building | lenz@mysql.com | 2005-01-17 | 1 | -1/+1 |
| * | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1 | bar@mysql.com | 2005-01-18 | 3 | -1/+26 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals | bar@mysql.com | 2005-01-18 | 3 | -1/+26 |
| * | | | | | | | | | | After merge fixes | monty@mysql.com | 2005-01-18 | 2 | -40/+8 |
| * | | | | | | | | | | Merge with global tree | monty@mysql.com | 2005-01-18 | 11 | -23/+83 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / |