Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 5.3-mwl128 -> 5.3 | Igor Babaev | 2010-10-27 | 1 | -2/+2 |
|\ | |||||
| * | MWL#128: Added into EXPLAIN output info about types of the used join buffers and | Igor Babaev | 2010-10-18 | 1 | -2/+2 |
* | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -1/+18 |
|\ \ | |||||
| * | | Merge XtraDB from Percona server 5.1.49-12 into MariaDB. | unknown | 2010-09-03 | 1 | -1/+1 |
| * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -0/+17 |
| |\ \ | |||||
| | * | | Bug #53814: NUMERIC_PRECISION for unsigned bigint field is 19, | Georgi Kodinov | 2010-06-23 | 1 | -0/+17 |
* | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -0/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -0/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#54422 query with = 'variables' | Sergey Glukhov | 2010-06-25 | 1 | -0/+10 |
* | | | | merge | Sergei Golubchik | 2010-06-14 | 1 | -3/+3 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | fixed for mysql-test-run to | Sergei Golubchik | 2010-06-10 | 1 | -3/+3 |
| * | | Merge XtraDB 10 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+2 |
* | | | after merge fix. | Sergei Golubchik | 2010-06-07 | 1 | -0/+2 |
* | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -1/+1 |
* | | | Merge with the latest changes in the 5.2 tree. | Igor Babaev | 2010-03-29 | 1 | -1/+23 |
|\ \ \ | |||||
| * \ \ | merged | Sergei Golubchik | 2010-03-15 | 1 | -1/+23 |
| |\ \ \ | | |/ / | |||||
| | * | | Automerge MySQL 5.1.44 merge into latest MariaDB trunk. | unknown | 2010-03-10 | 1 | -0/+22 |
| | |\ \ | |||||
| | | * \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+22 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug #50276: Security flaw in INFORMATION_SCHEMA.TABLES | Georgi Kodinov | 2010-01-21 | 1 | -0/+22 |
| | * | | | Fixes for two test failures in Buildbot. | unknown | 2010-03-10 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | WL#86: Partitioned key cache for MyISAM. | Igor Babaev | 2010-02-16 | 1 | -0/+1 |
|/ / / | |||||
* | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge XtraDB 9 into MariaDB. | unknown | 2010-01-15 | 1 | -1/+2 |
* | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -1/+13 |
|/ / | |||||
* | | Fix race in test of times shown in SHOW FULL PROCESSLIST. | unknown | 2009-09-29 | 1 | -1/+1 |
* | | Merge Percona microsec_process patch into MariaDB. | unknown | 2009-09-23 | 1 | -2/+12 |
* | | Merge XtraDB 6 into MariaDB. | unknown | 2009-08-03 | 1 | -0/+4 |
* | | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 1 | -8/+23 |
|\ \ | |||||
| * | | XtraDB after-merge fixes. | unknown | 2009-06-09 | 1 | -8/+23 |
* | | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -3/+3 |
|\ \ \ | |/ / | |||||
* | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -0/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | Bug 22047: Time in SHOW PROCESSLIST for SQL thread in replication seems to | Georgi Kodinov | 2009-03-17 | 1 | -0/+5 |
| |\ \ | |||||
| | * | | This belongs to the fix for | Matthias Leich | 2009-02-09 | 1 | -1/+1 |
* | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -12/+12 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Merge 5.0 -> 5.1 | Matthias Leich | 2009-02-09 | 1 | -12/+12 |
| |\ \ | | |/ | |||||
| | * | 2. Slice of fix for Bug#42003 tests missing the disconnect of connections <> ... | Matthias Leich | 2009-02-05 | 1 | -11/+11 |
* | | | Fix Valgrind errors seen in buildbot. | unknown | 2009-04-08 | 1 | -140/+2 |
* | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -16/+29 |
|\ \ \ | |/ / | |||||
| * | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-23 | 1 | -0/+5 |
| |\ \ | |||||
| | * | | Bug#35275 INFORMATION_SCHEMA.TABLES.CREATE_OPTIONS omits KEY_BLOCK_SIZE | Sergey Glukhov | 2008-12-10 | 1 | -0/+5 |
| |/ / |/| | | |||||
| * | | merge 5.1 --> 5.1-rpl | Alfranio Correia | 2008-12-13 | 1 | -9/+64 |
| |\ \ | |/ / |/| | | |||||
| * | | merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-r... | Andrei Elkin | 2008-11-12 | 1 | -3/+9 |
| |\ \ | |||||
| * | | | Check warnings in servers error log as part of test case | unknown | 2008-04-08 | 1 | -16/+20 |
| * | | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl | unknown | 2008-04-03 | 1 | -1/+14 |
| |\ \ \ | |||||
| * | | | | Add mtr database | unknown | 2008-04-02 | 1 | -0/+4 |
* | | | | | Bug#34517 SHOW GLOBAL STATUS does not work properly in embedded server. | Alexey Botchkov | 2008-11-17 | 1 | -0/+9 |
* | | | | | Bug#39955 SELECT on INFORMATION_SCHEMA.GLOBAL_VARIABLES takes too long | Sergey Glukhov | 2008-11-13 | 1 | -0/+47 |
* | | | | | Bug#35789 wrong datatypes for collation and charset columns in EVENTS, ROUTIN... | Sergey Glukhov | 2008-11-13 | 1 | -9/+8 |
| |_|/ / |/| | | | |||||
* | | | | Bug#29153 SHOW and INFORMATION_SCHEMA commands increment Created_tmp_disk_tables | Sergey Glukhov | 2008-10-09 | 1 | -3/+0 |
* | | | | Bug#38918 selecting from information_schema.columns is disproportionately slow | Sergey Glukhov | 2008-10-09 | 1 | -0/+9 |
| |/ / |/| | |