Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | Sergei Golubchik | 2011-10-11 | 1 | -0/+2 |
|\ | |||||
| * | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 1 | -0/+2 |
| |\ | |||||
| | * | tests for feedback plugin, | Sergei Golubchik | 2011-10-04 | 1 | -0/+2 |
| | * | Cherrypick fix for maria recovery bug LPBUG#686006 from 5.2 | Vladislav Vaintroub | 2011-05-04 | 2 | -0/+2 |
* | | | Removed settings of 'derived_merge' to 'on' in ps tests. | Igor Babaev | 2011-07-22 | 1 | -3/+0 |
* | | | Made the optimizer switches 'derived_merge' and 'derived_with_keys' | Igor Babaev | 2011-07-21 | 1 | -1/+3 |
* | | | BUG#778434 Wrong result with in_to_exists=on in maria-5.3-mwl89 | Sergey Petrunya | 2011-07-14 | 1 | -0/+29 |
* | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -0/+29 |
|\ \ \ | |||||
| * | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -0/+29 |
* | | | | Fix compile errors and warnings and test errors introduced by microseconds push. | Vladislav Vaintroub | 2011-05-28 | 1 | -0/+1 |
* | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 2 | -19/+128 |
|\ \ \ \ | |/ / / | |||||
| * | | | post-review changes 1 | Sergei Golubchik | 2011-05-19 | 1 | -0/+1 |
| * | | | lp:743017 Diverging results with TIME(3) and ranges depending on the executio... | Sergei Golubchik | 2011-03-29 | 1 | -2/+3 |
| * | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 2 | -19/+124 |
* | | | | Merge with 5.3 main | Michael Widenius | 2011-05-16 | 2 | -1/+154 |
|\ \ \ \ | |||||
| * \ \ \ | MWL#89 - Automatic merge with 5.3 | unknown | 2011-05-10 | 2 | -1/+154 |
| |\ \ \ \ | |||||
| | * \ \ \ | MWL#89 | unknown | 2011-05-02 | 2 | -1/+154 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | MWL#89 | unknown | 2011-04-01 | 2 | -1/+154 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | MWL#89 | unknown | 2011-03-30 | 2 | -1/+154 |
| | | | |\ \ \ \ | |||||
| | | | | * \ \ \ | MWL#89 | unknown | 2011-03-01 | 2 | -1/+154 |
| | | | | |\ \ \ \ | |||||
| | | | | | * \ \ \ | Merge MWL#89 into 5.3 main. | unknown | 2011-01-11 | 2 | -1/+154 |
| | | | | | |\ \ \ \ | |||||
| | | | | | | * | | | | - Fixed innodb_mysql_lock2 test failure because the test did not | unknown | 2010-11-19 | 1 | -1/+2 |
| | | | | | | * | | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformation | unknown | 2010-11-05 | 1 | -0/+152 |
| | | | | | | |\ \ \ \ | |||||
| | | | | | | | * | | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformation | unknown | 2010-10-23 | 1 | -6/+6 |
| | | | | | | | * | | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformation | unknown | 2010-10-20 | 1 | -0/+152 |
* | | | | | | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 12 | -46/+193 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 12 | -53/+193 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 12 | -53/+193 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | mtr: cleaned up some superfluos global warning suppressions | Bjorn Munch | 2011-03-30 | 2 | -45/+5 |
| | | * | | | | | | | | | Bug #11762804 55442: MYSQLD DEBUG CRASHES WHILE RUNNING MYISAM_CRASH_BEFORE_F... | Bjorn Munch | 2011-03-15 | 1 | -0/+24 |
| | | * | | | | | | | | | Bug #11762407 54999: MTR GLOBAL SUPPRESSION HIDES SQL THREAD EXECUTION UNEXPE... | Bjorn Munch | 2011-02-23 | 1 | -1/+0 |
| | | * | | | | | | | | | Fix for Bug#59837 - mysqlhotcopy fails with wrong error (11) on specific plat... | John H. Embretsen | 2011-02-08 | 1 | -1/+1 |
| | | * | | | | | | | | | BUG#59147: Automerged bzr bundle form bug report into mysql-5.1 . | Luis Soares | 2011-02-04 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | BUG#59147: rpl_circular_for_4_hosts fails sporadically | Luis Soares | 2011-02-03 | 1 | -1/+1 |
| | | * | | | | | | | | | | Fix for bug #58650 "Failing assertion: primary_key_no == -1 || | Dmitry Lenev | 2011-02-02 | 1 | -0/+16 |
| | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | merge mysql-5.1 (local) --> mysql-5.1 | Alfranio Correia | 2011-01-31 | 1 | -4/+4 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | BUG#59338 Inconsistency in binlog for statements that don't change any rows S... | Alfranio Correia | 2011-01-28 | 1 | -4/+4 |
| | | * | | | | | | | | | | Fix for Bug#56817 - mysqlhotcopy tests fail when DBI and DBD-mysql perl modul... | John H. Embretsen | 2011-01-29 | 2 | -0/+92 |
| | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge two patches for bug 56895 into tip of mysql-5.1 branch. | John H. Embretsen | 2011-01-27 | 6 | -12/+51 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | merge from 5.1 main | Bjorn Munch | 2011-01-19 | 4 | -0/+49 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | Bug#58546 test rpl_packet timeout failure sporadically on PB | Libing Song | 2011-01-19 | 4 | -0/+49 |
| | | | * | | | | | | | | | | Bug #59063 rpl_migration_crash_safe fails on Windows | Bjorn Munch | 2011-01-18 | 2 | -12/+2 |
| | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | | Bug#56895 part 1 of 2: Backport of revid holyfoot@mysql.com-20100823084827-js... | John H. Embretsen | 2011-01-14 | 1 | -1/+1 |
| | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | BUG#59063: rpl_migration_crash_safe fails on Windows | Sven Sandberg | 2011-01-14 | 2 | -2/+12 |
* | | | | | | | | | | | | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree. | unknown | 2011-05-03 | 4 | -5/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 4 | -5/+14 |
* | | | | | | | | | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 3 | -2/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | / / / / / / / | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 76 | -1590/+3378 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 3 | -2/+28 |
* | | | | | | | | | | | | merge LP BUG#68606 | Vladislav Vaintroub | 2011-03-30 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | / / / / / / | |_|_|_|_|/ / / / / / |/| | | | | | | | | | |