summaryrefslogtreecommitdiff
path: root/sql/tztime.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2018-08-031-1/+1
|\
| * Merge 10.1 into 10.2Marko Mäkelä2018-08-021-1/+1
| |\
| | * Merge branch '10.0' into bb-10.1-merge-sanjaOleksandr Byelkin2018-07-251-1/+1
| | |\
| | | * MDEV-13397 MariaDB upgrade fail when using default_time_zoneSergei Golubchik2018-07-191-1/+1
| | * | MDEV-14265 - RPMLint warning: shared-lib-calls-exitSergey Vojtovich2018-03-161-3/+1
* | | | Add likely/unlikely to speed up executionMonty2018-05-071-2/+3
* | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-03-281-3/+1
|\ \ \ \ | |/ / /
| * | | After-merge fix for commit 98eb9518db1da854048b09d94244a982a1d32f9aMarko Mäkelä2018-03-161-3/+1
* | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ...Vladislav Vaintroub2018-02-061-3/+3
* | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2018-02-041-4/+5
|\ \ \ \
| * | | | Added name to MEM_ROOT for esier debuggingMonty2018-02-021-4/+5
| |/ / /
* | | | Change C_STRING_WITH_LEN to STRING_WITH_LENMonty2018-01-301-4/+4
* | | | Changed database, tablename and alias to be LEX_CSTRINGMonty2018-01-301-17/+7
* | | | Enusure that my_global.h is included firstMichael Widenius2017-08-241-3/+2
|/ / /
* | | Reuse THD for new user connectionsMonty2016-06-041-1/+1
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-03-231-4/+4
|\ \ \ | |/ /
| * | Merge branch '10.0' into 10.1Sergei Golubchik2016-03-211-4/+4
| |\ \ | | |/
| | * Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-4/+4
| | * MDEV-9088 Server crashes on shutdown after the second post of feedback reportSergei Golubchik2015-12-191-4/+0
* | | MDEV-8715 - Obsolete sql_alloc() in favor of THD::alloc() and thd_alloc()Sergey Vojtovich2015-11-261-2/+0
|/ /
* | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-1/+2
|\ \ | |/
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-1/+2
| |\
| | * MDEV-6236 - [PATCH] mysql_tzinfo_to_sql may produce invalid SQLSergey Vojtovich2015-06-051-1/+2
* | | MDEV-6650 - LINT_INIT emits code in non-debug buildsSergey Vojtovich2015-03-161-3/+1
* | | don't let current_thd to point to a destroyed THDSergei Golubchik2015-02-031-4/+0
* | | cleanup: galera misc cleanupsSergei Golubchik2014-10-101-6/+4
* | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+12
|/ /
* | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wron...Sergei Golubchik2014-05-131-1/+1
* | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-1/+1
* | 10.0-base mergeSergei Golubchik2014-02-031-38/+154
|\ \
| * \ 5.5 mergeSergei Golubchik2014-02-011-38/+154
| |\ \ | | |/
| | * Fixed bug that I accidently introduced in mysql_tzinfo_to_sqlMichael Widenius2014-01-261-3/+4
| | * Fixed Mageia Bug 12355: mariadb produces warning messages while loading timez...Michael Widenius2014-01-241-37/+152
* | | 10.0-base mergeSergei Golubchik2013-12-161-4/+40
|\ \ \ | |/ /
| * | Fixing mtr failures in mysql_tzinfo_to_sql_symlink.test on Labrador:Alexander Barkov2013-11-261-1/+2
| * | Merge 5.5->10.0-baseAlexander Barkov2013-11-211-3/+38
| |\ \ | | |/
| | * Merge 5.3 -> 5.5Alexander Barkov2013-11-131-3/+38
| | |\
| | | * Merge 5.2 -> 5.3Alexander Barkov2013-11-131-3/+37
| | | |\
| | | | * Merge 5.1 -> 5.2Alexander Barkov2013-11-131-3/+37
| | | | |\
| | | | | * MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and aboveAlexander Barkov2013-11-131-3/+37
| | | * | | 5.2 -> 5.3Sergei Golubchik2013-02-281-18/+3
| | | |\ \ \ | | | | |/ /
| | | | * | 5.1 -> 5.2 mergeSergei Golubchik2013-02-281-18/+3
| | | | |\ \ | | | | | |/
| | | | | * mysql-5.1 mergeSergei Golubchik2013-02-281-18/+3
| | | | | |\
* | | | | | \ 10.0-monty mergeSergei Golubchik2013-07-211-6/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-1/+2
| * | | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-5/+5
* | | | | | | 5.5 mergeSergei Golubchik2013-06-061-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)Sergei Golubchik2013-04-171-2/+2
* | | | | | | my_dir() cleanupSergei Golubchik2013-04-071-1/+1
* | | | | | | 5.5 mergeSergei Golubchik2013-03-271-18/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |