Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2020-08-20 | 1 | -0/+3 |
|\ | |||||
| * | MDEV-23440: mysql_tzinfo_to_sql to use transactions | Daniel Black | 2020-08-15 | 1 | -0/+3 |
* | | MDEV-22626: mysql_tzinfo_to_sql not replicates timezone to galeranodes if onl... | Jan Lindström | 2020-08-07 | 1 | -9/+10 |
* | | Fixed deadlock with LOCK TABLES and ALTER TABLE | Monty | 2020-05-23 | 1 | -1/+1 |
* | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-12-23 | 1 | -5/+5 |
|\ \ | |/ | |||||
| * | MDEV-21209 : mysql_tzinfo_to_sql's Galera checks do not work | Jan Lindström | 2019-12-05 | 1 | -5/+5 |
* | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-08-20 | 1 | -9/+55 |
|\ \ | |/ | |||||
| * | MDEV-18778: mysql_tzinfo_to_sql does not work correctly in MariaDB Galera | Jan Lindström | 2019-08-16 | 1 | -9/+55 |
* | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2019-03-15 | 1 | -8/+3 |
|\ \ \ | |/ / | |||||
| * | | fix gcc 8 compiler warnings | Sergei Golubchik | 2019-03-14 | 1 | -8/+3 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-02 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0' into bb-10.1-merge-sanja | Oleksandr Byelkin | 2018-07-25 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | MDEV-13397 MariaDB upgrade fail when using default_time_zone | Sergei Golubchik | 2018-07-19 | 1 | -1/+1 |
| * | | | MDEV-14265 - RPMLint warning: shared-lib-calls-exit | Sergey Vojtovich | 2018-03-16 | 1 | -3/+1 |
* | | | | After-merge fix for commit 98eb9518db1da854048b09d94244a982a1d32f9a | Marko Mäkelä | 2018-03-16 | 1 | -3/+1 |
* | | | | Reuse THD for new user connections | Monty | 2016-06-04 | 1 | -1/+1 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-03-23 | 1 | -4/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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 |
* | | | | MDEV-8715 - Obsolete sql_alloc() in favor of THD::alloc() and thd_alloc() | Sergey Vojtovich | 2015-11-26 | 1 | -2/+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 |