Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove unneded #include's that had a dubious explanation | Sergei Golubchik | 2015-10-24 | 1 | -1/+0 |
* | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -2/+2 |
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+1 |
* | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -10/+19 |
|\ | |||||
| * | 5.2->5.3 merge | Sergei Golubchik | 2013-01-10 | 1 | -10/+19 |
| |\ | |||||
| | * | mysql-5.1.67 merge | Sergei Golubchik | 2013-01-09 | 1 | -10/+19 |
| | |\ | |||||
| | | * | Bug#14629232 SECURITY VULNERABILITY WITH SHOW PROFILE | Marc Alff | 2012-10-12 | 1 | -10/+19 |
| * | | | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -4/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -4/+4 |
| | |\ \ | | | |/ | |||||
* | | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * \ \ \ | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING) | Jon Olav Hauglid | 2012-06-29 | 1 | -3/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING) | Jon Olav Hauglid | 2012-06-29 | 1 | -3/+3 |
* | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -3/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
* | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+3 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+5 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+5 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
* | | | | | Fix build and packaging on Windows: | Vladislav Vaintroub | 2011-11-26 | 1 | -0/+4 |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -3/+3 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Bug#12756017 - PROFILING: SET_THD_PROC_INFO DOES NOT NEED TO CALL DIRNAME_LEN... | Tor Didriksen | 2011-07-20 | 1 | -1/+1 |
| * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | * | | | Bug #45287: phase 2 : 5.0 64 bit compilation warnings | Georgi Kodinov | 2009-07-16 | 1 | -1/+1 |
| | | * | | | backported a change from 5.1 | Georgi Kodinov | 2009-05-15 | 1 | -2/+2 |
| | | * | | | fixed a win32 compile error | Georgi Kodinov | 2009-05-15 | 1 | -2/+3 |
| | | * | | | Pull 5.1 treatment of community features into 5.0. | Chad MILLER | 2009-05-05 | 1 | -2/+2 |
| | | * | | | Push history-limiting code until after the code that adds new | unknown | 2007-11-14 | 1 | -206/+217 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+2 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | many changes to my_getsystime.c: | Sergei Golubchik | 2011-05-19 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -1/+21 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -6/+6 |
| |\ \ \ | | |/ / | |||||
| * | | | Patch set contributed by Alex Budovski (MCA) | Michael Widenius | 2010-01-29 | 1 | -0/+57 |
| * | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| * | | | | | proc_info_hook, mysys access to thd->proc_info | Sergei Golubchik | 2008-08-27 | 1 | -3/+0 |
* | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -4/+2 |
* | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+5 |
* | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -5/+45 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-15 | 1 | -0/+43 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Bug#50057: 'SHOW PROFILE CPU' port for Windows. | Vladislav Vaintroub | 2010-02-05 | 1 | -0/+43 |
| * | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -2/+2 |
| * | | | | | | | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -3/+0 |
| |/ / / / / / | |||||
* | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-03-20 | 1 | -6/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Bug #49829 Many "hides virtual function" warnings with | Staale Smedseng | 2010-03-14 | 1 | -6/+6 |
| | |_|/ / | |/| | | | |||||
* | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -1/+1 |