Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC. | Michael Widenius | 2012-10-03 | 1 | -9/+9 |
* | Automatic merge with 5.5 | Michael Widenius | 2012-09-01 | 5 | -6/+7 |
|\ | |||||
| * | Automatic merge | Michael Widenius | 2012-08-13 | 1 | -1/+2 |
| |\ | |||||
| | * | Fixed compiler warnings (A few of these was bugs) | Michael Widenius | 2012-08-13 | 1 | -1/+2 |
| * | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 4 | -5/+5 |
| |\ \ | | |/ | |/| | |||||
| | * | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING) | Jon Olav Hauglid | 2012-06-29 | 4 | -5/+5 |
* | | | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 1 | -1/+3 |
|\ \ \ | |/ / | |||||
| * | | MDEV-359: Fix another case where switch-off semisync could cause a race that ... | unknown | 2012-06-21 | 1 | -0/+1 |
| * | | MDEV-359: Server crash when SET GLOBAL rpl_semi_sync_master_enabled = OFF | unknown | 2012-06-21 | 1 | -1/+2 |
* | | | Fixed build failures found by buildbot | Michael Widenius | 2012-06-05 | 1 | -0/+1 |
|/ / | |||||
* | | mdev-201 - Assertion `!thd->spcont' failed in net_send_error on server shutdown | Sergei Golubchik | 2012-03-27 | 1 | -2/+3 |
* | | merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+1 |
|\ \ | |||||
| * | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -1/+1 |
* | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 6 | -17/+23 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | merge from 5.5.16 | Daniel Fischer | 2011-09-21 | 2 | -2/+4 |
| |\ | |||||
| | * | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 2 | -2/+4 |
| * | | BUG#12818224: 61921: WRITETRAXINBINLOG SHOULD BE WRITETRANXINBINLOG | Luis Soares | 2011-09-08 | 1 | -9/+9 |
| |/ | |||||
| * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 5 | -6/+10 |
* | | fixes for windows | Sergei Golubchik | 2011-10-21 | 1 | -9/+0 |
|/ | |||||
* | Automerged (cherrypicked) cset from 5.6: | Luis Soares | 2011-05-04 | 1 | -2/+2 |
* | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 3 | -50/+0 |
* | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect). | Alexander Nozdrin | 2010-08-12 | 1 | -4/+2 |
* | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 1 | -1/+1 |
|\ | |||||
| * | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -1/+1 |
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-09 | 1 | -2/+2 |
|/ | |||||
* | Post-merge fix: header is used by the client API. Obvious in retrospect. | Davi Arnaut | 2010-06-05 | 1 | -1/+1 |
* | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-05-31 | 2 | -0/+7 |
* | Auto merge from 5.1-rep-semisync | He Zhenxing | 2010-06-02 | 1 | -1/+2 |
|\ | |||||
| * | Post fix for bug#52748 | He Zhenxing | 2010-06-02 | 1 | -1/+2 |
* | | BUG#52748 Semi-Sync ACK packet isn't check for length | He Zhenxing | 2010-06-01 | 1 | -4/+14 |
|\ \ | |/ | |||||
| * | BUG#52748 Semi-Sync ACK packet isn't check for length | He Zhenxing | 2010-06-01 | 1 | -4/+14 |
* | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 3 | -1/+5 |
* | | Auto merge from 5.1-rep-semisync | He Zhenxing | 2010-03-11 | 1 | -126/+84 |
|\ \ | |/ | |||||
| * | Post fix for Bug#49557 | He Zhenxing | 2010-03-10 | 1 | -1/+2 |
| * | Bug#49557 "semisync" plugin test fails on Windows | He Zhenxing | 2010-02-23 | 1 | -126/+83 |
* | | Fix truncated GPL text. | Jonathan Perkin | 2010-02-26 | 1 | -1/+1 |
* | | merge | Vladislav Vaintroub | 2010-02-13 | 2 | -36/+272 |
|\ \ | |||||
| * \ | Manual Merge for bug#50157 | unknown | 2010-01-31 | 2 | -36/+272 |
| |\ \ | | |/ | |||||
| | * | BUG#50157 Assertion !active_tranxs_->is_tranx_end_pos(..) in ReplSemiSyncMast... | unknown | 2010-01-31 | 2 | -36/+273 |
| * | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-19 | 3 | -16/+58 |
| |\ \ | |||||
| * \ \ | merge | Vladislav Vaintroub | 2009-12-18 | 1 | -3/+0 |
| |\ \ \ | |||||
| | * | | | Bug #49811: inconsistent usage of SAFEMALLOC in debug compilation on windows | Vladislav Vaintroub | 2009-12-18 | 1 | -3/+0 |
| | * | | | Backporing patch for Bug#48351 (Inconsistent library names for semisync plugin) | Alexander Nozdrin | 2009-12-15 | 2 | -10/+10 |
| | |\ \ \ | |||||
* | | \ \ \ | merge | Vladislav Vaintroub | 2009-12-19 | 3 | -16/+58 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc | Marc Alff | 2009-12-11 | 5 | -92/+40 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-09 | 3 | -16/+58 |
* | | | | | | merge | Vladislav Vaintroub | 2009-12-11 | 4 | -91/+39 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge from trunk-bugfixing | He Zhenxing | 2009-12-05 | 2 | -3/+3 |
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | | |||||
| | * | | | Postfix after merge patch for Bug#49020 | He Zhenxing | 2009-12-04 | 2 | -3/+3 |
| * | | | | Auto merge postfix of Bug#49020 | He Zhenxing | 2009-12-04 | 1 | -2/+3 |
| |\ \ \ \ | | |/ / / |