Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 2 | -2/+7 |
|\ | |||||
| * | Bug#46586: When using the plugin interface the type "set" for options caused ... | Tatiana A. Nurnberg | 2009-10-27 | 2 | -2/+7 |
| * | Upmerge a Windows compile fix from 5.0 to 5.1. | Joerg Bruehe | 2009-10-16 | 1 | -1/+1 |
| |\ | |||||
* | \ | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-19 | 1 | -0/+4 |
|\ \ \ | |||||
| * \ \ | Upmerge the Windows compile fix from 5.0 to 5.1 | Joerg Bruehe | 2009-10-16 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Compile fix for Windows: | Joerg Bruehe | 2009-10-16 | 1 | -1/+1 |
| * | | Upmerge (automerge) into 5.1 | Joerg Bruehe | 2009-10-09 | 1 | -0/+4 |
| |\ \ | | |/ | |||||
| | * | Fix bug#47923 New "mf_keycache.c" requires thread support | Joerg Bruehe | 2009-10-08 | 1 | -0/+4 |
| | * | Bug#47768 pthread_cond_timedwait() is broken on windows | Kristofer Pettersson | 2009-10-06 | 1 | -1/+1 |
| | * | Merge bug#42850 to 5.0 | Magnus Blåudd | 2009-09-28 | 1 | -3/+4 |
| | |\ | |||||
* | | \ | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-19 | 3 | -47/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clash | Magnus Blåudd | 2009-10-06 | 3 | -47/+2 |
* | | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-14 | 1 | -2/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Automerg | Kristofer Pettersson | 2009-10-06 | 4 | -4/+41 |
| |\ \ \ | |||||
* | \ \ \ | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-13 | 6 | -13/+47 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | automerge | Georgi Kodinov | 2009-10-04 | 1 | -2/+10 |
| |\ \ \ \ | |||||
| | * | | | | Fix bug#46980 | Joerg Bruehe | 2009-09-17 | 1 | -2/+10 |
| * | | | | | auto-merge | Ingo Struewing | 2009-10-01 | 2 | -0/+30 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 2 | -0/+30 |
| * | | | | | Merge bug#42850 to 5.1 | Magnus Blåudd | 2009-09-28 | 1 | -3/+4 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Merge bug#42850 to 5.0 | Magnus Blåudd | 2009-09-28 | 1 | -3/+4 |
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | |||||
| | | * | | Bug#42850 race condition in my_thr_init.c | Magnus Blåudd | 2009-09-24 | 1 | -3/+4 |
| | * | | | fixed compilation warnings | Georgi Kodinov | 2009-09-24 | 1 | -1/+1 |
| * | | | | Automerge. | Alexey Kopytov | 2009-09-18 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Bug #43606: 4GB Limit on huge_pages shared memory set-up | Alexey Kopytov | 2009-09-18 | 1 | -1/+1 |
| * | | | | | Merge from 5.0 | Staale Smedseng | 2009-09-17 | 1 | -7/+2 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-17 | 1 | -5/+2 |
* | | | | | | Merge 5.1-bugteam -> trunk-alik. | Alexander Nozdrin | 2009-09-17 | 1 | -52/+96 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Bug#17332 - changing key_buffer_size on a running server | Ingo Struewing | 2009-09-09 | 1 | -52/+96 |
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | | | |||||
| | * | | | Bug#17332 - changing key_buffer_size on a running server | Ingo Struewing | 2009-09-07 | 2 | -495/+2181 |
* | | | | | Merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2009-09-16 | 7 | -13/+29 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-09-03 | 1 | -0/+7 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
| | * | | Fix for BUG#46591 - .frm file isn't sync'd with sync_frm enabled for | Satya B | 2009-09-03 | 1 | -0/+7 |
| | |/ | |||||
| | * | merge | Georgi Kodinov | 2009-09-02 | 2 | -7/+11 |
| | |\ | |||||
| * | \ | Manual merge. | Davi Arnaut | 2009-09-02 | 1 | -7/+10 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Post-merge fix. Observe C declaration placement rules. | Davi Arnaut | 2009-09-02 | 1 | -7/+9 |
| | |/ | |||||
| * | | Fixed win32 compilation warnings | Georgi Kodinov | 2009-09-02 | 1 | -0/+2 |
| * | | merging bugfix from 5.0 | Anurag Shekhar | 2009-08-31 | 1 | -4/+7 |
| |\ \ | | |/ | |||||
| | * | merging with changes in bugteam branch. | Anurag Shekhar | 2009-08-31 | 5 | -8/+9 |
| | |\ | |||||
| | * | | Bug #44723 Larger read_buffer_size values can cause performance | Anurag Shekhar | 2009-08-24 | 1 | -4/+7 |
| * | | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 5 | -8/+9 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 5 | -8/+9 |
| | |/ | |||||
| * | | Fix for a few assorted compiler warnings. | Davi Arnaut | 2009-08-28 | 1 | -1/+1 |
* | | | merge of 5.1-main into mysql-trunk. | Guilhem Bichot | 2009-08-12 | 3 | -9/+10 |
|\ \ \ | |/ / | |||||
| * | | Merge mysql-5.1-innodb_plugin to mysql-5.1. | Sergey Vojtovich | 2009-08-11 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Auto-merge | Ignacio Galarza | 2009-07-31 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails. | Ignacio Galarza | 2009-07-31 | 1 | -1/+1 |
| * | | | merging with mysql-5.1-bugteam branch | Satya B | 2009-07-27 | 1 | -7/+7 |
| |\ \ \ | |||||
| | * \ \ | merging with mysql-5.0-bugteam | V Narayanan | 2009-07-17 | 1 | -7/+7 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#43572 Handle failures from hash_init | V Narayanan | 2009-07-12 | 1 | -6/+7 |