Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 1 | -2/+28 |
|\ | |||||
| * | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -2/+28 |
| |\ | |||||
| | * | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 1 | -2/+27 |
| | |\ | |||||
| | | * | Bug #11765218 58157: INNODB LOCKS AN UNMATCHED ROW EVEN THOUGH USING | Annamalai Gurusami | 2012-07-12 | 1 | -2/+27 |
* | | | | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -0/+13 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -0/+13 |
| |\ \ \ | | |/ / | |||||
| | * | | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -0/+13 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #12752572 61579: REPLICATION FAILURE WHILE | Annamalai Gurusami | 2012-05-21 | 1 | -10/+10 |
| | | * | Bug #12752572 61579: REPLICATION FAILURE WHILE | Annamalai Gurusami | 2012-05-16 | 1 | -0/+13 |
* | | | | 5.2 merge | Sergei Golubchik | 2012-05-20 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.1 merge | Sergei Golubchik | 2012-05-18 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | merge with mysql-5.1.63 | Sergei Golubchik | 2012-05-17 | 1 | -0/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DML | Annamalai Gurusami | 2012-03-01 | 1 | -0/+2 |
* | | | | Changed names of statistic variables and counting matches instaed of rejected... | unknown | 2012-02-22 | 1 | -3/+3 |
* | | | | Remove engine-specific (but identical) icp callbacks. create one reusable | Sergei Golubchik | 2012-02-17 | 1 | -0/+21 |
* | | | | Rewrite IGNORE handling: | Michael Widenius | 2011-12-11 | 1 | -17/+21 |
* | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -3/+20 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -3/+20 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -1/+17 |
| | |\ \ | | | |/ | |||||
| | | * | Fix Bug#12661768 UPDATE IGNORE CRASHES SERVER IF TABLE IS INNODB AND IT IS | Vasil Dimov | 2011-10-25 | 1 | -1/+7 |
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+3 |
| | |\ \ | | | |/ | |||||
| | | * | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -2/+3 |
* | | | | Backported the fix and the test case for bug #58816 from mysql-5.6 code line. | Igor Babaev | 2011-10-29 | 1 | -0/+3 |
* | | | | Automatic merge | Michael Widenius | 2011-09-26 | 1 | -4/+3 |
|\ \ \ \ | |||||
| * | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -4/+3 |
* | | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_events | Sergei Golubchik | 2011-09-23 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -1/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -1/+6 |
* | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_write | Michael Widenius | 2011-06-27 | 1 | -4/+16 |
* | | | | Merge of mwl #106 into 5.3. | Igor Babaev | 2011-06-15 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge | Igor Babaev | 2011-05-20 | 1 | -2/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -2/+3 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -2/+3 |
| | | |\ \ \ \ | |||||
| | | | * | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -2/+3 |
* | | | | | | | | Upgraded to latest handlersocket code. This fixed LP:766870 "Assertion `next... | Michael Widenius | 2011-06-07 | 1 | -0/+2 |
|/ / / / / / / | |||||
* | | | | | | | Automatic merge | Michael Widenius | 2011-05-19 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Added HA_ERR_DISK_FULL handler error | Michael Widenius | 2011-05-18 | 1 | -0/+6 |
* | | | | | | | | Rewritten patch of percona - switching query cache on and off, removing comme... | unknown | 2011-05-18 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -8/+17 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -8/+17 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -8/+17 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-04-20 | 1 | -8/+15 |
| | | * | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-03-25 | 1 | -3/+3 |
* | | | | | | Added ALTER ONLINE TABLE, which will give an error if the change can't be don... | Michael Widenius | 2011-04-28 | 1 | -0/+3 |
* | | | | | | Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK" | Michael Widenius | 2011-04-28 | 1 | -0/+17 |
* | | | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 1 | -80/+129 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 1 | -22/+50 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Merge MWL#116 after-review fixes. | unknown | 2011-03-31 | 1 | -10/+11 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | MWL#116: After-review fixes. | unknown | 2011-03-31 | 1 | -10/+11 |
| * | | | | | | | Merge three Percona patches into mariadb-5.2-rpl: | unknown | 2011-01-26 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ |