Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge. | dlenev@mysql.com | 2004-12-31 | 1 | -4/+11 |
|\ | |||||
| * | Manual merge of patch implementing WL#1339 with main tree. | dlenev@mysql.com | 2004-12-29 | 1 | -4/+11 |
| |\ | |||||
| | * | WL#1339 "Add per account max_user_connections limit (maximum number | dlenev@brandersnatch.localdomain | 2004-12-29 | 1 | -4/+11 |
* | | | Merge bk-internal:/home/bk/mysql-5.0 | vtkachenko@intelp4d.mysql.com | 2004-12-31 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | Many files: | vtkachenko@intelp4d.mysql.com | 2004-12-24 | 1 | -2/+2 |
| * | | | logging_ok: | vtkachenko@intelp4d.mysql.com | 2004-12-24 | 1 | -0/+4 |
* | | | | Merge with global tree | monty@mysql.com | 2004-12-31 | 1 | -26/+29 |
|\ \ \ \ | |||||
| * | | | | After merge fixes | monty@mysql.com | 2004-12-31 | 1 | -1/+3 |
| * | | | | Merge with 4.1 | monty@mishka.local | 2004-12-22 | 1 | -25/+26 |
| |\ \ \ \ | |||||
| | * | | | | WL#2274 - INSERT..SELECT..UPDATE | acurtis@pcgem.rdg.cyberkinetica.com | 2004-12-13 | 1 | -23/+22 |
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | dlenev@mysql.com | 2004-12-09 | 1 | -1/+0 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix for bug #6765 "Implicit access to time zone description | dlenev@brandersnatch.localdomain | 2004-12-09 | 1 | -1/+0 |
| | * | | | | | Syntax extention: 'ALTER DATABASE' without db name (after review) | gluh@gluh.mysql.r18.ru | 2004-12-06 | 1 | -3/+8 |
* | | | | | | | wl#1629 SHOW with WHERE(final part, after review) | gluh@gluh.mysql.r18.ru | 2004-12-30 | 1 | -24/+30 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | revert "LOCK TABLES ... WHERE ENGINE=INNODB" | serg@serg.mylan | 2004-12-27 | 1 | -11/+2 |
* | | | | | | WL#925 - Privileges for stored routines | acurtis@pcgem.rdg.cyberkinetica.com | 2004-12-23 | 1 | -10/+17 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | dlenev@mysql.com | 2004-12-21 | 1 | -3/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | dlenev@mysql.com | 2004-12-19 | 1 | -7/+38 |
| |\ \ \ \ | |||||
| * | | | | | Fix for bug #6849 "Crash while preparing query containing const expr with | dlenev@brandersnatch.localdomain | 2004-12-17 | 1 | -3/+5 |
* | | | | | | Content merge. | jan@hundin.mysql.fi | 2004-12-21 | 1 | -7/+38 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Fix for bug #7210: information_schema: can't access when table-name = reserve... | gluh@gluh.mysql.r18.ru | 2004-12-18 | 1 | -0/+3 |
| * | | | | | bit type | ram@gw.mysql.r18.ru | 2004-12-17 | 1 | -7/+35 |
| |/ / / / | |||||
* | | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 | jan@hundin.mysql.fi | 2004-12-13 | 1 | -2/+11 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Content merge. | jan@hundin.mysql.fi | 2004-12-09 | 1 | -2/+11 |
| |\ \ \ \ | |||||
| | * | | | | Added support for a LOCK TABLES...WHERE ENGINE = InnoDB query which sets | jan@hundin.mysql.fi | 2004-12-09 | 1 | -2/+11 |
| | | |_|/ | | |/| | | |||||
* | | | | | Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privil... | gluh@gluh.mysql.r18.ru | 2004-12-10 | 1 | -14/+9 |
|/ / / / | |||||
* | | | | Merge with new VARCHAR code | monty@mysql.com | 2004-12-06 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Add support for up to VARCHAR (size up to 65535) | monty@mysql.com | 2004-12-06 | 1 | -3/+3 |
* | | | | | Merge with 4.1 | monty@mysql.com | 2004-12-06 | 1 | -14/+6 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Bug #6379: ENUM values are incorrectly converted | bar@mysql.com | 2004-12-02 | 1 | -14/+6 |
| | |/ | |/| | |||||
* | | | Merge mysql.com:/home/mydev/mysql-5.0 | ingo@mysql.com | 2004-11-25 | 1 | -41/+62 |
|\ \ \ | |||||
| * | | | WL#2050 - CREATE USER and DROP USER and RENAME USER | ingo@mysql.com | 2004-11-25 | 1 | -41/+62 |
* | | | | Fixed BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERY | pem@mysql.comhem.se | 2004-11-25 | 1 | -21/+7 |
|/ / / | |||||
* | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 | bell@sanja.is.com.ua | 2004-11-25 | 1 | -39/+27 |
|\ \ \ | |||||
| * | | | Fix for bug #5888 "Triggers with nonexistent columns cause packets | dlenev@brandersnatch.localdomain | 2004-11-24 | 1 | -39/+27 |
* | | | | merge | bell@sanja.is.com.ua | 2004-11-21 | 1 | -6/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | merge | bell@sanja.is.com.ua | 2004-11-11 | 1 | -6/+6 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | merge | bell@sanja.is.com.ua | 2004-10-07 | 1 | -4/+4 |
| | |\ \ | |||||
| | * \ \ | merge | bell@sanja.is.com.ua | 2004-10-05 | 1 | -6/+6 |
| | |\ \ \ | |||||
| | | * | | | fixed merged view fields names (BUG#5147) | bell@sanja.is.com.ua | 2004-09-14 | 1 | -6/+6 |
| * | | | | | After merge fixes | monty@mysql.com | 2004-11-09 | 1 | -1/+1 |
| * | | | | | Merge with 4.1 to get new thd->mem_root handling | monty@mysql.com | 2004-11-08 | 1 | -8/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mysql.com | 2004-11-03 | 1 | -13/+23 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Various syntax fixes in sql/sql_yacc.yy for stored procedures: | pem@mysql.comhem.se | 2004-11-03 | 1 | -13/+23 |
| * | | | | | | | Merge on pull | monty@mysql.com | 2004-11-03 | 1 | -49/+101 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Fixes after merge with 4.1 | monty@mysql.com | 2004-11-03 | 1 | -1/+2 |
| | * | | | | | | merge with 4.1 | monty@mysql.com | 2004-10-29 | 1 | -49/+100 |
| | |\ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ | Merge bk-internal:/home/bk/mysql-5.0/ | serg@serg.mylan | 2004-10-28 | 1 | -43/+47 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | smarter ALTER TABLE - don't copy the table if only comment or default val... | serg@serg.mylan | 2004-10-21 | 1 | -43/+47 |
* | | | | | | | | | merged | serg@serg.mylan | 2004-11-17 | 1 | -4/+8 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | |