Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-04-27 | 1 | -4/+13 |
|\ | |||||
| * | Merge the changes of the 5.5.3-m3 release build | Joerg Bruehe | 2010-04-18 | 1 | -4/+13 |
| |\ | |||||
| | * | Make the libraries we produce on Windows actually usable | Daniel Fischer | 2010-04-16 | 1 | -4/+13 |
* | | | Manual merge of mysql-5.1-bugteam to | Alexey Kopytov | 2010-04-19 | 1 | -1/+29 |
|\ \ \ | |/ / | |||||
| * | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+29 |
| |/ | |||||
* | | Automerge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-04-11 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Bug #47095: Can't open_files_limit really be larger than 65535? | Georgi Kodinov | 2010-04-09 | 1 | -1/+1 |
* | | Bug#41103 6.0 Windows embedded-server tests fail | Alexey Botchkov | 2010-02-25 | 1 | -6/+0 |
* | | merge | Vladislav Vaintroub | 2010-02-16 | 1 | -1/+20 |
|\ \ | |||||
| * \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -7/+32 |
| |\ \ | |||||
| * \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-15 | 1 | -1/+11 |
| |\ \ \ \ \ | |||||
| * | | | | | | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -1/+1 |
| * | | | | | | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -0/+19 |
* | | | | | | | Fix failing sys_vars.plugin_dir_basic - treat both '/' and '\' as path separa... | Vladislav Vaintroub | 2010-01-24 | 1 | -0/+2 |
* | | | | | | | merge | Vladislav Vaintroub | 2009-12-25 | 1 | -7/+32 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -7/+32 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | merge | Vladislav Vaintroub | 2009-12-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-17 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Automerge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2009-12-17 | 1 | -1/+1 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * | | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 1 | -0/+3 |
* | | | | | | | merge | Vladislav Vaintroub | 2009-12-19 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge | Mikael Ronstrom | 2009-12-14 | 1 | -1/+11 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge WL#5138 to mysql-next-mr | Mikael Ronstrom | 2009-11-27 | 1 | -11/+0 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | WL#5138 merged to mysql-next-mr | Mikael Ronstrom | 2009-11-20 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t... | Mikael Ronstrom | 2009-10-12 | 1 | -0/+2 |
* | | | | | | | merge | Vladislav Vaintroub | 2009-12-04 | 1 | -1/+11 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | WL#2360 Performance schema | Marc Alff | 2009-11-30 | 1 | -1/+11 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | merge | Vladislav Vaintroub | 2009-11-25 | 1 | -11/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -11/+0 |
| |/ / / / | |||||
* | | | | | WL#5161 : Cross-platform build with CMake | Vladislav Vaintroub | 2009-11-09 | 1 | -15/+96 |
|/ / / / | |||||
* | | | | backport of dbug extensions from 6.0: | Sergei Golubchik | 2009-10-30 | 1 | -2/+2 |
* | | | | Merging mysql-next-mr-merge to mysql-next-mr. | Alexander Barkov | 2009-10-21 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | A postfix for WL#751 | Alexander Barkov | 2009-10-16 | 1 | -0/+1 |
* | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 1 | -6/+0 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | 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 |
* | | | | merge | Vladislav Vaintroub | 2009-09-23 | 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 |
| | * | MySQL 5.0 backport of Chad Miller's patch for Bug#34309: | Davi Arnaut | 2009-05-30 | 1 | -1/+0 |
* | | | This is the downport of | Vladislav Vaintroub | 2009-09-11 | 1 | -4/+37 |
|/ / | |||||
* | | Merge 5.1-bugteam -> 5.1-innodb_plugin. | Sergey Vojtovich | 2009-07-14 | 1 | -1/+1 |
|\ \ | |||||
| * | | Bug #43397 mysql headers redefine pthread_mutex_init | Staale Smedseng | 2009-07-08 | 1 | -1/+1 |
* | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -0/+13 |
|/ / | |||||
* | | merge -5.0 into -5.1 (minor conflicts resolved) | Timothy Smith | 2009-04-01 | 1 | -34/+35 |
|\ \ | |/ | |||||
| * | auto-merge -build into -bugteam | Timothy Smith | 2009-04-01 | 1 | -34/+35 |
| |\ | |||||
| | * | cmd-line-utils/libedit/readline/readline.h | kent.boortz@sun.com | 2009-03-19 | 1 | -34/+35 |