Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -4/+4 |
|\ | |||||
| * | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -4/+4 |
| * | MDEV-9088 Server crashes on shutdown after the second post of feedback report | Sergei Golubchik | 2015-12-19 | 1 | -4/+0 |
* | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 1 | -1/+2 |
| |\ | |||||
| | * | MDEV-6236 - [PATCH] mysql_tzinfo_to_sql may produce invalid SQL | Sergey Vojtovich | 2015-06-05 | 1 | -1/+2 |
* | | | MDEV-6650 - LINT_INIT emits code in non-debug builds | Sergey Vojtovich | 2015-03-16 | 1 | -3/+1 |
* | | | don't let current_thd to point to a destroyed THD | Sergei Golubchik | 2015-02-03 | 1 | -4/+0 |
* | | | cleanup: galera misc cleanups | Sergei Golubchik | 2014-10-10 | 1 | -6/+4 |
* | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+12 |
|/ / | |||||
* | | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wron... | Sergei Golubchik | 2014-05-13 | 1 | -1/+1 |
* | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -1/+1 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -38/+154 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -38/+154 |
| |\ \ | | |/ | |||||
| | * | Fixed bug that I accidently introduced in mysql_tzinfo_to_sql | Michael Widenius | 2014-01-26 | 1 | -3/+4 |
| | * | Fixed Mageia Bug 12355: mariadb produces warning messages while loading timez... | Michael Widenius | 2014-01-24 | 1 | -37/+152 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -4/+40 |
|\ \ \ | |/ / | |||||
| * | | Fixing mtr failures in mysql_tzinfo_to_sql_symlink.test on Labrador: | Alexander Barkov | 2013-11-26 | 1 | -1/+2 |
| * | | Merge 5.5->10.0-base | Alexander Barkov | 2013-11-21 | 1 | -3/+38 |
| |\ \ | | |/ | |||||
| | * | Merge 5.3 -> 5.5 | Alexander Barkov | 2013-11-13 | 1 | -3/+38 |
| | |\ | |||||
| | | * | Merge 5.2 -> 5.3 | Alexander Barkov | 2013-11-13 | 1 | -3/+37 |
| | | |\ | |||||
| | | | * | Merge 5.1 -> 5.2 | Alexander Barkov | 2013-11-13 | 1 | -3/+37 |
| | | | |\ | |||||
| | | | | * | MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and above | Alexander Barkov | 2013-11-13 | 1 | -3/+37 |
| | | * | | | 5.2 -> 5.3 | Sergei Golubchik | 2013-02-28 | 1 | -18/+3 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | 5.1 -> 5.2 merge | Sergei Golubchik | 2013-02-28 | 1 | -18/+3 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | mysql-5.1 merge | Sergei Golubchik | 2013-02-28 | 1 | -18/+3 |
| | | | | |\ | |||||
* | | | | | \ | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -6/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -1/+2 |
| * | | | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -5/+5 |
* | | | | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) | Sergei Golubchik | 2013-04-17 | 1 | -2/+2 |
* | | | | | | | my_dir() cleanup | Sergei Golubchik | 2013-04-07 | 1 | -1/+1 |
* | | | | | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -18/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | |||||
| * | | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -18/+3 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge from 5.1 to 5.5 | Chaithra Gopalareddy | 2012-12-26 | 1 | -18/+3 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Bug#12347040: MEMORY LEAK IN CONVERT_TZ COULD POSSIBLY CAUSE | Chaithra Gopalareddy | 2012-12-26 | 1 | -18/+3 |
* | | | | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -18/+14 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -18/+14 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITH | Annamalai Gurusami | 2012-10-08 | 1 | -18/+14 |
* | | | | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -3/+3 |
* | | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -4/+4 |
|/ / / / / / | |||||
* | | | | | | Added new status variables: | Michael Widenius | 2012-09-09 | 1 | -1/+3 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | * | | | | Fixed memory overrun in mysql_tzinfo_to_sql | Michael Widenius | 2011-05-26 | 1 | -2/+2 |
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ \ |