summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-31/+76
|\
| * Fixed things missing in merge between 10.0-base and 10.0Michael Widenius2013-11-031-19/+9
| * Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-7/+64
| |\
| | * Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-011-33/+85
| | |\
| | | * Fixes for parallel slave:Michael Widenius2013-10-141-33/+85
| * | | 10.0-base merge (roles)Sergei Golubchik2013-10-291-4/+3
| |\ \ \ | | |/ /
| | * | find() method for Hash_set<>.Sergei Golubchik2013-10-181-4/+3
| * | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-151-1/+0
| |\ \ \ | | |/ /
| | * | Merge 5.5->10.0-baseIgor Babaev2013-10-131-1/+0
| | |\ \
| | | * \ Merge 5.3-5.5Igor Babaev2013-10-131-1/+0
| | | |\ \
| | | | * | Fixed bug mdev-5105.Igor Babaev2013-10-101-1/+0
* | | | | | bzr merge -r3890..3891 lp:codership-mysql/5.5Seppo Jaakola2013-11-061-1/+1
* | | | | | Merge fix.Jan Lindström2013-09-091-0/+19
* | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-1230/+597
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-4702 - Reduce usage of LOCK_openSergey Vojtovich2013-08-141-983/+95
| * | | | | MDEV-4786 merge 10.0-monty -> 10.0Sergei Golubchik2013-08-121-17/+9
| * | | | | MDEV-4786 merge 10.0-monty -> 10.0Sergei Golubchik2013-08-121-2/+1
| * | | | | MDEV-4786 - merge 10.0-monty - 10.0Sergey Vojtovich2013-07-251-1/+1
| * | | | | 10.0-monty mergeSergei Golubchik2013-07-211-278/+543
| |\ \ \ \ \
| | * | | | | Merge the following patch from MySQL 5.6.10, in order to make perfschema.binl...unknown2013-07-111-1/+1
| | * | | | | added lost part about preopened temporary tablesunknown2013-07-111-2/+13
| | * | | | | Fix assert failures in main.merge test (line 234) and main.merge_mmap (line 44)Sergey Petrunya2013-07-081-9/+0
| | * | | | | Merge performance schema test cases from MySQL 5.6.10unknown2013-07-081-1/+1
| | * | | | | fixed opening temporary tables.unknown2013-07-051-3/+48
| | * | | | | Fixed issues with partitions and create temporary table SELECT ...Michael Widenius2013-07-031-2/+17
| | * | | | | mdl_sync now works.Michael Widenius2013-07-021-14/+1
| | * | | | | merge of 2876.430.11 & 2876.430.1unknown2013-06-271-8/+7
| | * | | | | Don't update table and index statics for temporary tablesMichael Widenius2013-06-221-12/+0
| | * | | | | Case when we close temporary table which was not opened in its engine (ALTER ...unknown2013-06-211-2/+7
| | * | | | | Fixed some memory leaksMichael Widenius2013-06-191-0/+1
| | * | | | | Fixed some merge issues:Michael Widenius2013-06-181-1/+22
| | * | | | | More merge fixes:Michael Widenius2013-06-161-38/+3
| | * | | | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-276/+556
| * | | | | | 10.0-base mergeSergei Golubchik2013-07-181-9/+8
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | 5.5 mergeSergei Golubchik2013-07-171-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | mysql-5.5.32 mergeSergei Golubchik2013-07-161-1/+1
| | | |\ \ \ \
| | | | * | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191-1/+1
| | * | | | | | MDEV-4456 Reverse discovery of ARCHIVE table on SELECT after disappearance of...Sergei Golubchik2013-06-161-8/+7
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 10.0-base mergeSergei Golubchik2013-06-061-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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
* | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-2/+34
|/ / / / / /
* | | | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-3/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-26: Global transaction ID. First alpha release.unknown2013-04-151-3/+12
| |\ \ \ \ \
| | * | | | | MDEV-26: Global transaction ID.unknown2013-03-261-0/+7
| | * | | | | MDEV-26: Global transaction IDunknown2013-02-251-0/+1
| | * | | | | MDEV-500: Session variable for server_idunknown2012-10-231-3/+4
* | | | | | | remove numerous #ifdef HAVE_PSI_TABLE_INTERFACESergei Golubchik2013-04-151-10/+2
* | | | | | | 10.0-base mergeSergei Golubchik2013-04-151-417/+263
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |