Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | bar@mysql.com | 2005-03-29 | 1 | -0/+6 |
|\ | |||||
| * | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 | bar@mysql.com | 2005-03-29 | 1 | -0/+6 |
| |\ | |||||
| | * | Adding Cybozu's patch. | bar@mysql.com | 2005-03-29 | 1 | -0/+6 |
* | | | more merge fixes | petr@mysql.com | 2005-03-29 | 1 | -8/+4 |
* | | | manual merge | petr@mysql.com | 2005-03-29 | 1 | -11/+119 |
|\ \ \ | |/ / | |||||
| * | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 | petr@mysql.com | 2005-03-29 | 1 | -14/+121 |
| |\ \ | | |/ | |/| | |||||
| | * | Post-review fixes for "!include" patch originating from Yahoo! (the whole pat... | petr@mysql.com | 2005-03-25 | 1 | -14/+121 |
* | | | Manual merge | konstantin@mysql.com | 2005-03-26 | 2 | -1/+226 |
|\ \ \ | |/ / | |||||
| * | | A fix for Bug#8226 "Cannot connect via shared memory": | konstantin@mysql.com | 2005-03-26 | 2 | -1/+225 |
* | | | Merge bk-internal:/home/bk/mysql-5.0 | serg@serg.mylan | 2005-03-21 | 1 | -2/+5 |
|\ \ \ | |||||
| * \ \ | Manual merge of csets from -build tree into main 5.0 tree. | dlenev@mysql.com | 2005-03-21 | 1 | -2/+5 |
| |\ \ \ | |||||
| | * | | | Eliminate warnings noticed by VC7. This includes fixing my_mmap() on | jimw@mysql.com | 2005-03-18 | 1 | -2/+5 |
* | | | | | Merge bk-internal:/home/bk/mysql-5.0 | serg@serg.mylan | 2005-03-17 | 1 | -27/+48 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Field::quote_data(): | serg@serg.mylan | 2005-03-17 | 1 | -27/+48 |
| |/ / / | |||||
* | | | | Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants... | brian@zim.(none) | 2005-03-16 | 1 | -2/+1 |
|/ / / | |||||
* | | | after merge fixes | serg@serg.mylan | 2005-03-09 | 1 | -2/+4 |
* | | | merged | serg@serg.mylan | 2005-03-09 | 2 | -5/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ | serg@serg.mylan | 2005-03-07 | 2 | -5/+3 |
| |\ \ | |||||
| | * | | Merge 4.0.24 compile changes into the 4.1 tree. | joerg@mysql.com | 2005-03-07 | 1 | -37/+222 |
| | * | | Manual merge of the 4.0.24 compile changes into the 4.1 tree. | joerg@mysql.com | 2005-03-07 | 2 | -227/+40 |
| | |\ \ | | | |/ | | |/| | |||||
| * | | | myisam/ft_parser.c | serg@serg.mylan | 2005-03-06 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 | joerg@mysql.com | 2005-03-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge changes. | joerg@mysql.com | 2005-03-08 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Please the Sun C compiler by qualifying 'inline' as 'static inline'. | joerg@mysql.com | 2005-03-04 | 1 | -2/+2 |
| | * | | Qualify 'inline' functions as 'static inline' to please the Sun C compiler. | joerg@mysql.com | 2005-03-04 | 1 | -3/+3 |
* | | | | Fixed Bug#8922. | jani@ua141d10.elisa.omakaista.fi | 2005-03-08 | 1 | -12/+4 |
|/ / / | |||||
* | | | Clean up merge | jimw@mysql.com | 2005-03-07 | 1 | -4/+12 |
|\ \ \ | |||||
| * | | | Avoid calls to my_seek() and my_tell() on log files so that | jimw@mysql.com | 2005-03-02 | 1 | -4/+12 |
* | | | | Merge with after merge fix | ingo@mysql.com | 2005-03-04 | 1 | -4/+4 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ | serg@serg.mylan | 2005-03-04 | 1 | -4/+4 |
| |\ \ \ | |||||
| | * \ \ | merge | serg@serg.mylan | 2005-03-03 | 1 | -4/+4 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Merge bk-internal:/home/bk/mysql-4.0/ | serg@serg.mylan | 2005-03-03 | 1 | -4/+4 |
| | | |\ \ | |||||
| | | | * | | Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it) | serg@serg.mylan | 2005-03-03 | 1 | -4/+4 |
| | | | |/ | |||||
| | | * | | merge | ramil@mysql.com | 2005-02-25 | 1 | -2/+8 |
| | | |\ \ | | | | |/ | | | |/| | |||||
| | | | * | A fix (bug #5056: defaults-extra-file throws no error when file is inaccessib... | ram@gw.mysql.r18.ru | 2004-09-02 | 1 | -2/+8 |
* | | | | | Merged from 4.1 | jimw@mysql.com | 2005-03-03 | 1 | -1/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-8707 | jimw@mysql.com | 2005-03-03 | 1 | -1/+6 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Don't try to create a symlink if the DATA DIRECTORY specified for a table | jimw@mysql.com | 2005-02-23 | 1 | -1/+6 |
* | | | | | workaround for a bug removed | serg@serg.mylan | 2005-03-02 | 1 | -7/+2 |
* | | | | | my_mmap.c: | reggie@mdk10.(none) | 2005-03-01 | 1 | -3/+1 |
* | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 | petr@mysql.com | 2005-03-01 | 1 | -38/+4 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 | petr@mysql.com | 2005-02-27 | 1 | -38/+4 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 | petr@mysql.com | 2005-02-20 | 1 | -2/+2 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | merge | petr@mysql.com | 2005-02-19 | 1 | -38/+4 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | made IM to work with --defaults-file smoothly | petr@mysql.com | 2005-02-18 | 1 | -38/+4 |
* | | | | | | | | | fix compilation failure on sunfire280 | petr@mysql.com | 2005-03-01 | 1 | -1/+0 |
* | | | | | | | | | merge with 4.1 | monty@mysql.com | 2005-02-28 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Fixed wrong memory references found by purify | monty@mysql.com | 2005-02-28 | 1 | -0/+4 |
* | | | | | | | | Merge with global tree | monty@mysql.com | 2005-02-25 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Show all generated warnings in SHOW ERROR | monty@mysql.com | 2005-02-24 | 1 | -2/+3 |