Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -31/+76 |
|\ | |||||
| * | Fixed things missing in merge between 10.0-base and 10.0 | Michael Widenius | 2013-11-03 | 1 | -19/+9 |
| * | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 1 | -7/+64 |
| |\ | |||||
| | * | Merge MDEV-4506: Parallel replication into 10.0-base. | unknown | 2013-11-01 | 1 | -33/+85 |
| | |\ | |||||
| | | * | Fixes for parallel slave: | Michael Widenius | 2013-10-14 | 1 | -33/+85 |
| * | | | 10.0-base merge (roles) | Sergei Golubchik | 2013-10-29 | 1 | -4/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | find() method for Hash_set<>. | Sergei Golubchik | 2013-10-18 | 1 | -4/+3 |
| * | | | Merge 10.0-base -> 10.0 | Alexander Barkov | 2013-10-15 | 1 | -1/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 5.5->10.0-base | Igor Babaev | 2013-10-13 | 1 | -1/+0 |
| | |\ \ | |||||
| | | * \ | Merge 5.3-5.5 | Igor Babaev | 2013-10-13 | 1 | -1/+0 |
| | | |\ \ | |||||
| | | | * | | Fixed bug mdev-5105. | Igor Babaev | 2013-10-10 | 1 | -1/+0 |
* | | | | | | bzr merge -r3890..3891 lp:codership-mysql/5.5 | Seppo Jaakola | 2013-11-06 | 1 | -1/+1 |
* | | | | | | Merge fix. | Jan Lindström | 2013-09-09 | 1 | -0/+19 |
* | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -1230/+597 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-4702 - Reduce usage of LOCK_open | Sergey Vojtovich | 2013-08-14 | 1 | -983/+95 |
| * | | | | | MDEV-4786 merge 10.0-monty -> 10.0 | Sergei Golubchik | 2013-08-12 | 1 | -17/+9 |
| * | | | | | MDEV-4786 merge 10.0-monty -> 10.0 | Sergei Golubchik | 2013-08-12 | 1 | -2/+1 |
| * | | | | | MDEV-4786 - merge 10.0-monty - 10.0 | Sergey Vojtovich | 2013-07-25 | 1 | -1/+1 |
| * | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -278/+543 |
| |\ \ \ \ \ | |||||
| | * | | | | | Merge the following patch from MySQL 5.6.10, in order to make perfschema.binl... | unknown | 2013-07-11 | 1 | -1/+1 |
| | * | | | | | added lost part about preopened temporary tables | unknown | 2013-07-11 | 1 | -2/+13 |
| | * | | | | | Fix assert failures in main.merge test (line 234) and main.merge_mmap (line 44) | Sergey Petrunya | 2013-07-08 | 1 | -9/+0 |
| | * | | | | | Merge performance schema test cases from MySQL 5.6.10 | unknown | 2013-07-08 | 1 | -1/+1 |
| | * | | | | | fixed opening temporary tables. | unknown | 2013-07-05 | 1 | -3/+48 |
| | * | | | | | Fixed issues with partitions and create temporary table SELECT ... | Michael Widenius | 2013-07-03 | 1 | -2/+17 |
| | * | | | | | mdl_sync now works. | Michael Widenius | 2013-07-02 | 1 | -14/+1 |
| | * | | | | | merge of 2876.430.11 & 2876.430.1 | unknown | 2013-06-27 | 1 | -8/+7 |
| | * | | | | | Don't update table and index statics for temporary tables | Michael Widenius | 2013-06-22 | 1 | -12/+0 |
| | * | | | | | Case when we close temporary table which was not opened in its engine (ALTER ... | unknown | 2013-06-21 | 1 | -2/+7 |
| | * | | | | | Fixed some memory leaks | Michael Widenius | 2013-06-19 | 1 | -0/+1 |
| | * | | | | | Fixed some merge issues: | Michael Widenius | 2013-06-18 | 1 | -1/+22 |
| | * | | | | | More merge fixes: | Michael Widenius | 2013-06-16 | 1 | -38/+3 |
| | * | | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -276/+556 |
| * | | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -9/+8 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
| | * | | | | | | MDEV-4456 Reverse discovery of ARCHIVE table on SELECT after disappearance of... | Sergei Golubchik | 2013-06-16 | 1 | -8/+7 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) | Sergei Golubchik | 2013-04-17 | 1 | -2/+2 |
* | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -2/+34 |
|/ / / / / / | |||||
* | | | | | | Merge 10.0-base -> 10.0 (GTID). | unknown | 2013-04-17 | 1 | -3/+12 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-26: Global transaction ID. First alpha release. | unknown | 2013-04-15 | 1 | -3/+12 |
| |\ \ \ \ \ | |||||
| | * | | | | | MDEV-26: Global transaction ID. | unknown | 2013-03-26 | 1 | -0/+7 |
| | * | | | | | MDEV-26: Global transaction ID | unknown | 2013-02-25 | 1 | -0/+1 |
| | * | | | | | MDEV-500: Session variable for server_id | unknown | 2012-10-23 | 1 | -3/+4 |
* | | | | | | | remove numerous #ifdef HAVE_PSI_TABLE_INTERFACE | Sergei Golubchik | 2013-04-15 | 1 | -10/+2 |
* | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -417/+263 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | |