Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merged | Sergei Golubchik | 2010-03-15 | 1 | -4/+17 |
|\ | |||||
| * | Automerge MySQL 5.1.44 merge into MariaDB trunk. | unknown | 2010-03-09 | 1 | -1/+14 |
| |\ | |||||
| | * | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+14 |
| | |\ | |||||
| | | * | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 1 | -1/+1 |
| | | * | BUG#46364 MyISAM transbuffer problems (NTM problem) | Alfranio Correia | 2010-01-20 | 1 | -0/+2 |
| | | * | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -0/+11 |
| | | |\ | |||||
| | | | * | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 1 | -0/+12 |
| | | | * | Bug #45287: phase 2 : 5.0 64 bit compilation warnings | Georgi Kodinov | 2009-07-16 | 1 | -1/+1 |
| | | | * | Bug #32223 SETting max_allowed_packet variable | Staale Smedseng | 2009-06-19 | 1 | -4/+19 |
| | | | * | Fix improperly-protected variable definition and use. | Chad MILLER | 2009-05-11 | 1 | -2/+2 |
| | | | * | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -1/+17 |
| | | | |\ | |||||
| | | | | * | Pull 5.1 treatment of community features into 5.0. | Chad MILLER | 2009-05-05 | 1 | -1/+3 |
| | | | | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -8/+8 |
| | | | | |\ | |||||
| | | | | * \ | Merge from Tim's 5.0.76-release tree to make 5.0.77 . | Chad MILLER | 2009-01-21 | 1 | -0/+7 |
| | | | | |\ \ | |||||
| | | | | * \ \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -23/+44 |
| | | | | |\ \ \ | |||||
| | | | | * | | | | Bug#37428 Potential security issue with UDFs - linux shellcode execution. | Alexey Botchkov | 2008-07-28 | 1 | -0/+1 |
| | | | | * | | | | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -1/+1 |
| | | | | |\ \ \ \ | |||||
| | | | | * \ \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -32/+87 |
| | | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -1/+15 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -1/+15 |
| | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -1/+15 |
| | | | | | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | Fix for BUG#43660- SHOW INDEXES/ANALYZE does NOT update cardinality | Satya B | 2009-04-24 | 1 | -0/+6 |
| | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -8/+8 |
| | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | | | |||||
| * | | | | | | | | | | | small code cleanup - "good ifdef is no ifdef" | Sergei Golubchik | 2010-03-08 | 1 | -3/+3 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |