summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge revisions from maria/5.5 (5.5.41)Nirbhay Choubey2014-12-221-23/+1
|\
| * mysql-5.5.41 mergeSergei Golubchik2014-12-191-23/+1
| |\
| | * Bug #18808072 MYSQLBINLOG USES LOCALTIME() TO PRINT EVENTS, CAUSES KERNEL MUT...Venkatesh Duggirala2014-10-081-23/+1
* | | Merge revisions from maria/5.5Nirbhay Choubey2014-12-163-10/+51
|\ \ \ | |/ /
| * | MDEV-4010 Deadlock on concurrent INSERT .. SELECT into an Aria table with sta...Michael Widenius2014-12-151-7/+9
| * | MDEV-6939 : Dots in file names of configuration filesNirbhay Choubey2014-10-292-3/+42
* | | Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-062-3/+9
|\ \ \ | |/ /
| * | mysql-5.5.39 mergeSergei Golubchik2014-08-022-3/+9
| |\ \ | | |/
| | * Bug#18207212 : FILE NAME IS NOT ESCAPED IN BINLOG FOR LOAD DATA INFILE STATEMENTNeeraj Bisht2014-05-151-1/+8
| | * Backport from trunk:Tor Didriksen2014-05-071-2/+1
* | | bzr merge -rtag:mariadb-5.5.38 maria/5.5Nirbhay Choubey2014-06-102-8/+19
|\ \ \ | |/ /
| * | mysql-5.5.38 mergeSergei Golubchik2014-06-031-0/+3
| |\ \ | | |/
| | * Bug #17514920 MYSQL_THREAD_INIT() CALL WITHOUT MYSQL_INIT() IS CRASHING IN WI...Igor Solodovnikov2014-04-231-0/+3
| * | MDEV-6124 Audit plugin fails with the Percona-Server 5.6.Alexey Botchkov2014-04-171-8/+16
* | | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-165-0/+5
|\ \ \ | |/ /
| * | mysql-5.5.37 selective mergeSergei Golubchik2014-03-275-0/+5
| |\ \ | | |/
| | * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-175-0/+5
| * | MDEV-5829: STOP SLAVE resets global status variablesMichael Widenius2014-03-141-1/+1
* | | Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-02-2531-39/+54
|\ \ \ | |/ /
| * | MDEV-5613 m_string.h exports generic function names without a namespace prefi...Sergei Golubchik2014-02-171-0/+1
| * | MySQL-5.5.36 mergeSergei Golubchik2014-02-1730-39/+53
| |\ \ | | |/
| | * Updated/added copyright headersMurthy Narkedimilli2014-01-0627-27/+43
| | * Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTIONTor Didriksen2013-12-182-4/+4
| | * Bug#17702677 WRONG INSTRUMENTATION INTERFACE FOR MYSQL_COND_TIMEDWAITChristopher Powers2013-11-071-2/+2
* | | * Merged the missing revision 3934 fromNirbhay Choubey2014-02-051-102/+104
* | | Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-294-3/+12
|\ \ \ | |/ /
| * | MySQL-5.5.35 mergeSergei Golubchik2014-01-222-2/+6
| |\ \ | | |/
| | * Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE LIBR...Sreedhar.S2013-10-091-0/+5
| | * Bug #16978278 : BUFFER OVERFLOW WHEN PRINTING A LARGE 64-BIT INTEGERmithun2013-09-101-2/+2
| | |\
| | | * Bug #16978278 : BUFFER OVERFLOW WHEN PRINTING A LARGE 64-BIT INTEGERmithun2013-09-101-2/+2
| * | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria...Michael Widenius2014-01-221-1/+2
| * | | my_addr_resolve: don't resolve unknown addresses to ??:0(??), but return an e...Sergei Golubchik2013-12-121-0/+4
| * | | Fix for a compiler warning.Nirbhay Choubey2013-11-251-3/+0
* | | | Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-31/+0
* | | | * Updated auto_increment_xxx_func.result to reflect the changesNirbhay Choubey2013-12-101-1/+2
* | | | MDEV-4108 Compilation warnings with RelWithDebInfoNirbhay Choubey2013-11-251-3/+0
* | | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-252-8/+4
|\ \ \ \ | |/ / /
| * | | mysql-5.5.34 mergeSergei Golubchik2013-11-191-2/+4
| |\ \ \ | | |/ /
| | * | Bug#16865959 - PLEASE BACKPORT BUG 14749800.Praveenkumar Hulakund2013-07-241-2/+4
| * | | Allow unique prefix for command line options, like any GNU program.Michael Widenius2013-09-231-6/+0
* | | | Merged revisions 3916--3921 from lp:~codership/codership-mysql/5.5-23Jan Lindström2013-09-261-9/+3
* | | | mariadb-5.5.33 mergeSergei Golubchik2013-09-189-23/+308
|\ \ \ \ | |/ / /
| * | | MDEV-4941 make: AIX fails with 'Identifier not allowed in cast'; syntax error...Sergei Golubchik2013-09-091-3/+6
| * | | MDEV-4472 Audit-plugin. Server-related part of the task.Alexey Botchkov2013-09-093-1/+225
| * | | mysql-5.5.33 mergeSergei Golubchik2013-09-062-7/+55
| |\ \ \ | | |/ /
| | * | merge back to the 5.5 tree and fix indentationGeorgi Kodinov2013-06-281-1/+11
| | |\ \
| | | * | Bug #16996656: UNIQUE OPTION PREFIXES NOT DEPRECATED IN 5.5+Georgi Kodinov2013-06-261-1/+11
| | |/ /
| | * | Bug#16729109: FIX COMPILATION WARNINGS WITH GCC 4.8Tor Didriksen2013-06-141-1/+6
| | * | Bug#16194302: SUPPORT FOR FLOATING-POINT SYSTEM VARIABLESAshish Agarwal2013-05-191-5/+38
| * | | MDEV-4165 [PATCH] RFE: make tmpdir a build-time configurable optionSergei Golubchik2013-08-172-2/+2