Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 4.1 | monty@mysql.com | 2004-10-29 | 1 | -70/+117 |
|\ | |||||
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | konstantin@mysql.com | 2004-10-22 | 1 | -0/+2 |
| |\ | |||||
| | * | A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field | konstantin@mysql.com | 2004-10-22 | 1 | -0/+2 |
| * | | Manual merge. | konstantin@mysql.com | 2004-10-21 | 1 | -17/+28 |
| |\ \ | | |/ | |/| | |||||
| | * | A fix and test case for bug#6059 "mysql_stmt_field_count returns | konstantin@mysql.com | 2004-10-21 | 1 | -17/+28 |
| * | | Merge with 4.0 | monty@mysql.com | 2004-10-20 | 1 | -0/+3 |
| |\ \ | | |/ | |/| | |||||
| | * | Code cleanups (done during review of new code) | monty@mysql.com | 2004-10-20 | 1 | -1/+1 |
| | * | Added startup option and settable session variable | marko@hundin.mysql.fi | 2004-10-13 | 1 | -0/+3 |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | konstantin@mysql.com | 2004-10-14 | 1 | -6/+6 |
| |\ \ | |||||
| | * | | A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)" | konstantin@mysql.com | 2004-10-14 | 1 | -6/+6 |
| * | | | Move Heikki's comment about thd->query comment to proper place | konstantin@mysql.com | 2004-10-13 | 1 | -18/+17 |
| |/ / | |||||
| * | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 | ram@gw.mysql.r18.ru | 2004-10-10 | 1 | -1/+3 |
| |\ \ | |||||
| | * | | Blob support for the group_concat() function. | ram@gw.mysql.r18.ru | 2004-10-10 | 1 | -1/+3 |
| * | | | A small simplification: perform two actions at once, register a | konstantin@mysql.com | 2004-10-10 | 1 | -4/+5 |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | konstantin@mysql.com | 2004-10-08 | 1 | -0/+31 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | A fix for Bug#5748 "Prepared statement with BETWEEN and bigint values | konstantin@mysql.com | 2004-10-08 | 1 | -0/+31 |
| * | | | Merge with 4.0 for 4.1 release | monty@mysql.com | 2004-10-06 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Merge mysql.com:/home/mydev/mysql-4.0 | ingo@mysql.com | 2004-10-05 | 1 | -0/+1 |
| | |\ | |||||
| | | * | BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). | ingo@mysql.com | 2004-09-24 | 1 | -0/+1 |
| * | | | A couple of typos fixed. | konstantin@mysql.com | 2004-10-04 | 1 | -2/+0 |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | dlenev@mysql.com | 2004-09-23 | 1 | -2/+14 |
| |\ \ \ | |||||
| | * | | | Implementation of Monty's idea about clear_alloc_root() optimization and clea... | dlenev@brandersnatch.localdomain | 2004-09-23 | 1 | -2/+14 |
| * | | | | A fix and test case for Bug#5315 "mysql_change_user() doesn't free | konstantin@mysql.com | 2004-09-22 | 1 | -3/+10 |
| |/ / / | |||||
| * | | | moved all ndb thread specific data into new placeholder | tomas@poseidon.(none) | 2004-09-14 | 1 | -2/+1 |
| * | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 | tulin@build.mysql.com | 2004-09-09 | 1 | -21/+0 |
| |\ \ \ | |||||
| | * \ \ | merged | serg@serg.mylan | 2004-09-07 | 1 | -21/+0 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Replacing class Disable_binlog by macros. Patch already approved by Monty. | guilhem@mysql.com | 2004-09-06 | 1 | -21/+0 |
| | | |/ | |||||
| * | | | renamed ha_recovery_logging to ha_enable_transaction | tomas@poseidon.(none) | 2004-09-03 | 1 | -0/+1 |
| |/ / | |||||
* | | | sql_updatable_view_key replaced with updatable_views_with_limit | bell@sanja.is.com.ua | 2004-10-07 | 1 | -1/+1 |
* | | | merge | bell@sanja.is.com.ua | 2004-10-04 | 1 | -9/+6 |
|\ \ \ | |||||
| * \ \ | merge | bell@sanja.is.com.ua | 2004-09-29 | 1 | -9/+6 |
| |\ \ \ | |||||
| | * | | | post review changes: | bell@sanja.is.com.ua | 2004-09-29 | 1 | -1/+1 |
| | * | | | added CHECK option test for INSERT ... ON DUPLICATE KEY UPDATE (WL#1983) | bell@sanja.is.com.ua | 2004-09-06 | 1 | -9/+6 |
* | | | | | Strict mode & better warnings | monty@mishka.local | 2004-09-28 | 1 | -3/+10 |
|/ / / / | |||||
* | | | | Merge | monty@mishka.local | 2004-09-15 | 1 | -0/+63 |
|\ \ \ \ | |||||
| * \ \ \ | Merge. | jani@rhols221.adsl.netsonic.fi | 2004-09-13 | 1 | -0/+61 |
| |\ \ \ \ | |||||
| | * | | | | Added per thread status variables, after review, patch v1.1. | jani@rhols221.adsl.netsonic.fi | 2004-09-13 | 1 | -0/+61 |
| | |/ / / | |||||
| * | | | | post merge fixes | bell@sanja.is.com.ua | 2004-09-10 | 1 | -0/+2 |
* | | | | | Added options --auto-increment-increment and --auto-increment-offset. | monty@mishka.local | 2004-09-15 | 1 | -14/+17 |
|/ / / / | |||||
* | | | | After merge fixes of merge with 4.1 that included the new arena code. | monty@mysql.com | 2004-09-09 | 1 | -0/+4 |
* | | | | Merge with 4.1 | monty@mysql.com | 2004-09-06 | 1 | -44/+72 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Change Item_arena::state to enum | sergefp@mysql.com | 2004-08-31 | 1 | -4/+4 |
| * | | Merge: manual resolve | konstantin@mysql.com | 2004-08-24 | 1 | -3/+19 |
| |\ \ | |||||
| | * | | Fix for Bug#5034 "prepared "select 1 into @arg15", second | konstantin@mysql.com | 2004-08-24 | 1 | -3/+19 |
| * | | | Fix to compile with msvc: converted static const int Item_arena::* to enum me... | sergefp@mysql.com | 2004-08-24 | 1 | -4/+8 |
| |/ / | |||||
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | konstantin@mysql.com | 2004-08-21 | 1 | -68/+60 |
| |\ \ | |||||
| | * | | Fix for bug#4912 "mysqld crashs in case a statement is executed | konstantin@mysql.com | 2004-08-21 | 1 | -68/+60 |
| * | | | merged | serg@serg.mylan | 2004-08-20 | 1 | -2/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions, | guilhem@mysql.com | 2004-08-20 | 1 | -2/+2 |
| * | | | merged | serg@serg.mylan | 2004-08-20 | 1 | -1/+0 |
| |\ \ \ |