Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -0/+13 |
|\ | |||||
| * | Merge from mysql-5.1 to mysql-5.5 | Annamalai Gurusami | 2012-05-21 | 1 | -10/+10 |
| |\ | |||||
| | * | Bug #12752572 61579: REPLICATION FAILURE WHILE | Annamalai Gurusami | 2012-05-21 | 1 | -10/+10 |
| * | | Merge from mysql-5.1 to mysql-5.5. | Annamalai Gurusami | 2012-05-16 | 1 | -0/+13 |
| |\ \ | | |/ | |||||
| | * | Bug #12752572 61579: REPLICATION FAILURE WHILE | Annamalai Gurusami | 2012-05-16 | 1 | -0/+13 |
| | * | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DML | Annamalai Gurusami | 2012-03-01 | 1 | -0/+2 |
* | | | lp:1023404 problems with savepoints and tokudb with 5.5 | Sergei Golubchik | 2012-07-11 | 1 | -4/+0 |
* | | | MDEV-342: Do not mark old binlog file as cleanly closed during rotate until | unknown | 2012-06-21 | 1 | -0/+1 |
* | | | c | Sergei Golubchik | 2012-05-21 | 1 | -4/+8 |
|\ \ \ | |/ / | |||||
| * | | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2012-04-12 | 1 | -0/+307 |
| |\ \ | |||||
| | * | | Bug#11815557 60269: MYSQL SHOULD REJECT ATTEMPTS TO CREATE SYSTEM | unknown | 2012-04-11 | 1 | -0/+307 |
| * | | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DML | Annamalai Gurusami | 2012-02-27 | 1 | -3/+7 |
| |/ / | |||||
| * | | Merge mysql-5.1-security -> mysql-5.5-security (Fix Bug#12661768) | Vasil Dimov | 2011-10-25 | 1 | -1/+7 |
| |\ \ | | |/ | |||||
* | | | Fixed LP bug #999251: Q13 from DBT3 uses table scan instead of covering index... | Igor Babaev | 2012-05-16 | 1 | -0/+2 |
* | | | Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed i... | Michael Widenius | 2012-03-20 | 1 | -1/+1 |
* | | | Merge MWL #247 from mariadb 5.3 -> mariadb 5.5. | Igor Babaev | 2012-03-02 | 1 | -4/+5 |
|\ \ \ | |||||
| * \ \ | Merge. | Igor Babaev | 2012-02-22 | 1 | -0/+21 |
| |\ \ \ | |||||
| * | | | | Fixed calculation of rec_per_key elements for added components of the extende... | Igor Babaev | 2012-01-01 | 1 | -4/+5 |
* | | | | | overlay support for mysql-test-run and mysqltest | Sergei Golubchik | 2012-02-23 | 1 | -1/+1 |
* | | | | | MDEV-117 Assertion: prebuilt->sql_stat_start || trx->conc_state == 1 failed a... | Sergei Golubchik | 2012-03-01 | 1 | -0/+2 |
* | | | | | 5.3 merge | Sergei Golubchik | 2012-02-24 | 1 | -3/+3 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Changed names of statistic variables and counting matches instaed of rejected... | unknown | 2012-02-22 | 1 | -3/+3 |
* | | | | | 5.3 merge | Sergei Golubchik | 2012-02-21 | 1 | -0/+21 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Remove engine-specific (but identical) icp callbacks. create one reusable | Sergei Golubchik | 2012-02-17 | 1 | -0/+21 |
| |/ / / | |||||
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -18/+38 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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 |
| | | |\ \ \ | | | | |/ / | |||||
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -4/+11 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 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 |
* | | | | | | merge | Sergei Golubchik | 2011-11-03 | 1 | -10/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -10/+10 |
* | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Bug#12547647 UPDATE LOGGING COULD EXCEED LOG PAGE SIZE | Marko Mäkelä | 2011-09-01 | 1 | -0/+3 |
| * | | | | | Fix bug #11830883, SUPPORT "CORRUPTED" BIT FOR INNODB TABLES AND INDEXES. | Jimmy Yang | 2011-08-16 | 1 | -0/+4 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -132/+243 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | 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 |