summaryrefslogtreecommitdiff
path: root/sql/tztime.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-18/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge from 5.1 to 5.5Chaithra Gopalareddy2012-12-261-18/+3
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Bug#12347040: MEMORY LEAK IN CONVERT_TZ COULD POSSIBLY CAUSEChaithra Gopalareddy2012-12-261-18/+3
* | | | | | | 5.5 mergeSergei Golubchik2013-01-291-18/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | mysql-5.5.29 mergeSergei Golubchik2013-01-151-18/+14
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITHAnnamalai Gurusami2012-10-081-18/+14
* | | | | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-3/+3
* | | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-4/+4
|/ / / / / /
* | | | | | Added new status variables:Michael Widenius2012-09-091-1/+3
* | | | | | 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge with 5.2.Michael Widenius2011-12-111-2/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+4
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | |\ \ \ | | | | | |/ | | | | |/|
| | * | | | Fixed memory overrun in mysql_tzinfo_to_sqlMichael Widenius2011-05-261-2/+2
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \
| | | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| * | | | | | automerge 5.1-security --> 5.5-security (bug 55424)Gleb Shchepa2010-08-151-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-42/+53
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | merge with 5.1-microSergei Golubchik2011-06-071-49/+45
| |\ \ \ \ \ \
| | * | | | | | revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-061-38/+45
| | | |/ / / / | | |/| | | |
| * | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-9/+25
| |\ \ \ \ \ \ | | |/ / / / / | | | | | / / | | |_|_|/ / | |/| | | |
* | | | | | merge.Sergei Golubchik2010-11-251-17/+27
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge with 5.1Sergei Golubchik2010-10-251-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | 5.1.51 mergeSergei Golubchik2010-10-191-1/+1
| | |\ \ \ \ | | | |/ / /
| * | | | | fix for valgrind warningSergei Golubchik2010-06-171-4/+13
View Lorry Controller Status