Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -0/+3 |
|\ | |||||
| * | Fixed compile error on windows. | Michael Widenius | 2010-01-14 | 1 | -0/+3 |
* | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -4/+12 |
|\ \ | |/ | |||||
| * | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -4/+12 |
| |\ | |||||
| | * | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 1 | -0/+6 |
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -3/+6 |
| | * | Bug#45498: Socket variable not available on Windows | Davi Arnaut | 2009-09-22 | 1 | -2/+2 |
| | * | A patch for Bug#45118 (mysqld.exe crashed in debug mode | Alexander Nozdrin | 2009-09-10 | 1 | -0/+1 |
* | | | Automatic merge with 5.1 | Michael Widenius | 2009-10-28 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -0/+4 |
* | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -0/+3 |
|/ / | |||||
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -66/+98 |
|\ \ | |||||
| * | | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -66/+98 |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -2/+2 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Fix for BUG#10206 - InnoDB: Transaction requiring Max_BinLog_Cache_size > 4GB | Satya B | 2009-05-15 | 1 | -2/+2 |
* | | Fix of BUG#45632 (http://bugs.mysql.com/bug.php?id=45632) - sharing non defau... | unknown | 2009-06-25 | 1 | -3/+20 |
* | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -2/+2 |
|\ \ | |||||
| * | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -2/+2 |
* | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -0/+93 |
|\ \ \ | | |/ | |/| | |||||
| * | | @@optimizer_switch switch from no_xxx to xxx={on|off} syntax: | Sergey Petrunia | 2009-03-16 | 1 | -1/+1 |
| * | | Merge | Sergey Petrunia | 2009-03-14 | 1 | -2/+3 |
| |\ \ | |||||
| * | | | @@optimizer_switch backport and change from no_xxx to xx=on|off: post-review ... | Sergey Petrunia | 2009-03-14 | 1 | -0/+8 |
| * | | | Change optimizer_switch from no_xxx to xxx=on/xx=off. | Sergey Petrunia | 2009-03-11 | 1 | -14/+47 |
| * | | | Merge | Sergey Petrunia | 2009-03-10 | 1 | -77/+158 |
| |\ \ \ | |||||
| * | | | | - Backport @@optimizer_switch support from 6.0 | Sergey Petrunia | 2009-02-23 | 1 | -0/+52 |
* | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -77/+164 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -77/+159 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#40657: assertion with out of range variables and traditional sql_mode | Tatiana A. Nurnberg | 2009-03-11 | 1 | -2/+3 |
| | | |/ | | |/| | |||||
| | * | | manual merge | Tatiana A. Nurnberg | 2009-03-06 | 1 | -1/+12 |
| | |\ \ | |||||
| | | * | | BUG#41980 SBL, INSERT .. SELECT .. LIMIT = ERROR, even when @@SQL_LOG_BIN is 0 ! | Guangbao Ni | 2009-03-05 | 1 | -1/+12 |
| | * | | | Bug#40657: assertion with out of range variables and traditional sql_mode | Tatiana A. Nurnberg | 2009-03-05 | 1 | -9/+8 |
| | * | | | automerge | Tatiana A. Nurnberg | 2009-02-27 | 1 | -74/+145 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Bug#40657: assertion with out of range variables and traditional sql_mode | Tatiana A. Nurnberg | 2009-02-27 | 1 | -24/+42 |
| | | * | | Bug#40657: assertion with out of range variables and traditional sql_mode | Tatiana A. Nurnberg | 2009-02-24 | 1 | -102/+80 |
| | | * | | Bug#40657: assertion with out of range variables and traditional sql_mode | Tatiana A. Nurnberg | 2009-02-03 | 1 | -50/+125 |
| | * | | | Bug#41077: Warning contains wrong future version | Davi Arnaut | 2009-02-16 | 1 | -2/+2 |
| | | |/ | | |/| | |||||
| * | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -0/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#42610 Dynamic plugin broken in 5.1.31 | Sergey Glukhov | 2009-02-09 | 1 | -0/+5 |
* | | | | Fix Valgrind errors seen in buildbot. | unknown | 2009-04-08 | 1 | -8/+8 |
* | | | | Added "pool-of-threads" handling (with libevent) | Michael Widenius | 2009-03-13 | 1 | -1/+8 |
* | | | | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -0/+11 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -3/+11 |
| |\ \ \ | | |/ / | |||||
* | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -3/+11 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Auto-merge from upstream 5.1-bugteam | Timothy Smith | 2009-01-08 | 1 | -1/+8 |
| |\ \ \ | |||||
| | * \ \ | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2009-01-05 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * \ \ | Merge main 5.1 into 5.1-build | Joerg Bruehe | 2008-12-10 | 1 | -108/+168 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | * | | | Merge from mysql-5.1.30-release | unknown | 2008-11-27 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * | | | Added "Sun Microsystems, Inc." to copyright headers on files modified | Build Team | 2008-11-10 | 1 | -1/+1 |
| | * | | | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2008-12-24 | 1 | -0/+7 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | | * | | | | Bug#41456 SET PASSWORD hates CURRENT_USER() | Sergey Glukhov | 2008-12-24 | 1 | -0/+7 |