Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 7 | -34/+125 |
|\ | |||||
| * | Added more general support for sorting 2 characters as one (contractions) | Michael Widenius | 2009-11-30 | 1 | -1/+26 |
| * | MySQL 5.1.41 after-merge fix: Fix non-debug build breakage. | unknown | 2009-11-16 | 1 | -0/+1 |
| * | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 6 | -33/+98 |
| |\ | |||||
| | * | merge | Vladislav Vaintroub | 2009-11-03 | 3 | -0/+24 |
| | |\ | |||||
| | | * | Automerge. | Davi Arnaut | 2009-11-02 | 2 | -0/+20 |
| | | |\ | |||||
| | | | * | Bug#41728: Dropped symbol but no soname change | Davi Arnaut | 2009-09-29 | 2 | -72/+84 |
| | | * | | A follow-up to fix for | Sergey Vojtovich | 2009-10-27 | 1 | -0/+4 |
| | * | | | Bug#47571: idle named pipe connection is unkillable | Vladislav Vaintroub | 2009-11-02 | 1 | -2/+6 |
| | |/ / | |||||
| | * | | Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clash | Magnus BlÄudd | 2009-10-06 | 1 | -1/+0 |
| | * | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 1 | -0/+10 |
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -3/+3 |
| | * | | Merge from 5.0 | Staale Smedseng | 2009-09-17 | 1 | -6/+0 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-17 | 1 | -6/+0 |
| | | * | Bug#17332 - changing key_buffer_size on a running server | Ingo Struewing | 2009-09-07 | 1 | -0/+6 |
| | * | | Add DBUG_VIOLATION_HELPER_LEAVE definition to non-debug build. | Alexander Nozdrin | 2009-09-10 | 1 | -0/+1 |
| | * | | A patch for Bug#45118 (mysqld.exe crashed in debug mode | Alexander Nozdrin | 2009-09-10 | 1 | -4/+47 |
| | * | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-09-03 | 1 | -0/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Fix for BUG#46591 - .frm file isn't sync'd with sync_frm enabled for | Satya B | 2009-09-03 | 1 | -0/+1 |
* | | | | Fixes after comments from last push: | Michael Widenius | 2009-11-30 | 3 | -10/+16 |
* | | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing) | Michael Widenius | 2009-11-30 | 2 | -4/+4 |
* | | | | Automatic merge | Michael Widenius | 2009-11-25 | 1 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Added error handling for my_seek() & my_tell() failures | Michael Widenius | 2009-11-07 | 1 | -2/+3 |
* | | | | Safety change to ensure read/black trees (used with heap tables) works on 64 ... | Michael Widenius | 2009-11-16 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -0/+19 |
|\ \ \ | |||||
| * \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -0/+19 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -0/+19 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -0/+13 |
* | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -1/+2 |
|/ / / | |||||
* | | | Added client functions: | Michael Widenius | 2009-10-02 | 2 | -0/+4 |
* | | | MWL#17: Table elimination: fixes for windows | Sergey Petrunya | 2009-09-16 | 1 | -0/+1 |
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -2/+1 |
|\ \ \ | |||||
| * | | | MWL#17: Table-elimination | Sergey Petrunya | 2009-09-01 | 1 | -2/+1 |
* | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 12 | -66/+108 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge mysql-5.1-innodb_plugin to mysql-5.1. | Sergey Vojtovich | 2009-08-11 | 4 | -10/+33 |
| |\ \ | |||||
| | * \ | Merge 5.1-bugteam -> 5.1-innodb_plugin. | Sergey Vojtovich | 2009-07-14 | 4 | -4/+5 |
| | |\ \ | |||||
| | * | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 4 | -10/+33 |
| * | | | | Auto-merge | Ignacio Galarza | 2009-07-31 | 2 | -2/+4 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails. | Ignacio Galarza | 2009-07-31 | 2 | -2/+4 |
| * | | | | Bug#45800 crash when replacing into a merge table and there is a duplicate | V Narayanan | 2009-07-30 | 1 | -0/+1 |
| * | | | | merge 5.0-bugteam to 5.1-bugteam | Satya B | 2009-07-24 | 1 | -1/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge to mysql-5.0-bugteam | Satya B | 2009-07-24 | 1 | -1/+9 |
| | |\ \ \ | |||||
| | * | | | | Fix for BUG#18828 - If InnoDB runs out of undo slots, | Satya B | 2009-07-17 | 1 | -1/+2 |
| * | | | | | Merge from 5.0 | Staale Smedseng | 2009-07-23 | 1 | -1/+9 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Bug #45770 errors reading server SSL files are printed, but | Staale Smedseng | 2009-07-23 | 1 | -1/+9 |
| | |/ / / | |||||
| | * | | | Bug #45287: phase 2 : 5.0 64 bit compilation warnings | Georgi Kodinov | 2009-07-16 | 1 | -1/+1 |
| * | | | | automerge | Georgi Kodinov | 2009-07-16 | 1 | -9/+0 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
| | * | | Bug #45287: phase 1 : 32 bit compilation warnings | Georgi Kodinov | 2009-07-15 | 1 | -9/+0 |
| * | | | Automerge. | Alexey Kopytov | 2009-07-12 | 1 | -1/+2 |
| |\ \ \ | |||||
| | * | | | Bug #45796: invalid memory reads and writes when altering merge | Alexey Kopytov | 2009-07-10 | 1 | -1/+2 |