Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -6/+0 |
* | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 2 | -4/+4 |
* | Merge 5.3->5.5. | Igor Babaev | 2012-06-24 | 1 | -0/+2 |
|\ | |||||
| * | Merge 5.2->5.3 | Igor Babaev | 2012-06-23 | 1 | -0/+2 |
| |\ | |||||
| | * | Fixed bug mdev-360. | Igor Babaev | 2012-06-23 | 1 | -0/+2 |
* | | | merge with 5.3. | Sergei Golubchik | 2012-06-04 | 1 | -4/+23 |
|\ \ \ | |/ / | |||||
| * | | MDEV-294 SELECT WHERE ST_CONTAINS doesn't return all the records where ST_CON... | Alexey Botchkov | 2012-05-29 | 1 | -4/+23 |
| * | | merge | Sergei Golubchik | 2012-04-05 | 7 | -19/+15 |
| |\ \ | | |/ | |||||
| | * | merge | Sergei Golubchik | 2012-04-05 | 7 | -19/+15 |
| | |\ | |||||
| | | * | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 7 | -19/+15 |
| | | |\ | |||||
* | | | | | Building RPMs with CPack | Sergei Golubchik | 2012-05-22 | 1 | -4/+4 |
* | | | | | c | Sergei Golubchik | 2012-05-21 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Bug#11815557 60269: MYSQL SHOULD REJECT ATTEMPTS TO CREATE SYSTEM | unknown | 2012-04-11 | 1 | -0/+43 |
| * | | | | | Merge 5.1 => 5.5 | Tor Didriksen | 2012-03-06 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge of compatibility fixes | Michael Widenius | 2012-04-02 | 1 | -1/+5 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Automatic merge | Michael Widenius | 2012-03-28 | 1 | -1/+5 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with 5.1 | Michael Widenius | 2012-03-28 | 1 | -1/+5 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Fixed lp:944422 "mysql_upgrade destroys Maria tables?" | Michael Widenius | 2012-03-28 | 1 | -1/+5 |
| * | | | | | Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable ke... | Michael Widenius | 2012-02-28 | 4 | -8/+15 |
* | | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 10 | -31/+35 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 10 | -10/+10 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 7 | -11/+7 |
| * | | | | | BUG#11754145 - 45702: IMPOSSIBE TO SPECIFY MYISAM_SORT_BUFFER > 4GB | Ashish Agarwal | 2012-02-02 | 6 | -11/+20 |
| * | | | | | BUG#11756869: Merge from mysql-5.1 to mysql-5.5 | Ashish Agarwal | 2012-02-02 | 1 | -9/+8 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | BUG#11756869 - 48848: MYISAMCHK DOING SORT RECOVER IN CERTAIN | Ashish Agarwal | 2012-02-02 | 1 | -8/+8 |
| | |\ \ \ \ | |||||
| | | * | | | | BUG#11756869 - 48848: MYISAMCHK DOING SORT RECOVER IN CERTAIN | Ashish Agarwal | 2012-02-01 | 1 | -8/+8 |
* | | | | | | | overlay support for mysql-test-run and mysqltest | Sergei Golubchik | 2012-02-23 | 2 | -0/+3 |
* | | | | | | | 5.3 merge | Sergei Golubchik | 2012-02-21 | 2 | -20/+8 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Automatic merge | Michael Widenius | 2012-02-21 | 3 | -4/+13 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 3 | -4/+13 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | * | | | | | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 3 | -4/+13 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
| | | | * | | | | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 3 | -4/+13 |
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | |||||
| * | | | | | | | BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, S... | Sergey Petrunya | 2012-02-20 | 1 | -1/+5 |
| |/ / / / / / | |||||
| * | | | | | | Remove engine-specific (but identical) icp callbacks. create one reusable | Sergei Golubchik | 2012-02-17 | 1 | -25/+3 |
| * | | | | | | Counters for Index Condition Pushdown added (MDEV-130). | unknown | 2012-02-16 | 1 | -1/+7 |
* | | | | | | | Merge MySQL 5.5.20 into MariaDB 5.5. | unknown | 2012-02-14 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | merged bug#12361113. | Mattias Jonsson | 2011-12-14 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | merge | Mattias Jonsson | 2011-12-14 | 1 | -0/+3 |
* | | | | | | | Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO"; | Michael Widenius | 2012-01-24 | 1 | -2/+11 |
* | | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 2 | -4/+10 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge of patch for bug#11756764 from mysql-5.1. | Nirbhay Choubey | 2011-11-29 | 2 | -4/+10 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Bug#11756764 48726: MYSQLD KEEPS CRASHING WITH SIGSEGV | Nirbhay Choubey | 2011-11-29 | 2 | -4/+10 |
| * | | | | | | Merge. | Sergey Vojtovich | 2011-10-21 | 2 | -5/+16 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
* | | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 31 | -36/+65 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 40 | -92/+187 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 40 | -109/+188 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 6 | -10/+21 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | | * | | | BUG#11757032 - 49030: OPTIMIZE TABLE BREAKS MYISAM TABLE WHEN | Sergey Vojtovich | 2011-10-20 | 2 | -5/+16 |
| | | | | |/ | | | | |/| | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 40 | -82/+166 |
| | | |\ \ \ | |||||
| * | | | | | | bug 857066 Wrong result with ST_DISJOINT when using an index. | Alexey Botchkov | 2011-11-29 | 1 | -1/+1 |