Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge InnoDB fixes from 5.5 revisions 4229, 4230, 4233, 4237 and 4238 i.e. | Jan Lindström | 2014-07-25 | 1 | -0/+1 |
* | MDEV-5080 Assertion `strcmp(share->unique_file_name,filename) || share->last_... | Sergei Golubchik | 2013-11-04 | 1 | -1/+1 |
* | Instead of writing "Errcode" to the log for Slave errors, use "Internal Maria... | Michael Widenius | 2013-05-03 | 1 | -1/+1 |
* | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -1/+0 |
|\ | |||||
| * | MDEV-531 : Warning: Forcing close of thread ... in rpl_binlog_index | Vladislav Vaintroub | 2012-11-02 | 1 | -1/+0 |
* | | MDEV-225: Replace with dummy events an event that is not understood by a slav... | unknown | 2012-06-22 | 1 | -0/+2 |
|/ | |||||
* | merge | Sergei Golubchik | 2012-01-16 | 1 | -1/+1 |
|\ | |||||
| * | MDEV-63 - attempt to fix the warning exclusion | Vladislav Vaintroub | 2012-01-09 | 1 | -1/+1 |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -0/+15 |
| |\ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -0/+15 |
| | |\ | |||||
* | | \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -0/+15 |
|\ \ \ \ | |||||
| * \ \ \ | Merge from mysql-5.1 to mysql-5.5. | Jon Olav Hauglid | 2011-07-04 | 1 | -14/+14 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Fix MTR broken by last push. | Jon Olav Hauglid | 2011-07-04 | 1 | -14/+14 |
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -47/+2 |
| | |\ \ \ | |||||
| * | \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -0/+15 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -0/+15 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+11 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -39/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -46/+1 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| * | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -0/+3 |
| |/ / / / | |||||
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -47/+19 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | mtr: cleaned up some superfluos global warning suppressions | Bjorn Munch | 2011-03-30 | 1 | -43/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | mtr: cleaned up some superfluos global warning suppressions | Bjorn Munch | 2011-03-30 | 1 | -45/+1 |
| * | | | | Upmerge 11762407 (54999) with additions | Bjorn Munch | 2011-02-23 | 1 | -1/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug #11762407 54999: MTR GLOBAL SUPPRESSION HIDES SQL THREAD EXECUTION UNEXPE... | Bjorn Munch | 2011-02-23 | 1 | -1/+0 |
| | | |/ | | |/| | |||||
| * | | | Bug #36022 please log more information about "Sort aborted" queries | Tor Didriksen | 2011-02-02 | 1 | -3/+0 |
| * | | | A patch for Bug#48874 (Test "is_triggers" fails because of wrong charset info). | Alexander Nozdrin | 2010-10-14 | 1 | -0/+18 |
* | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -0/+11 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | Backport revision alik@sun.com-20100223131824-comthndat57kx8s5: | Davi Arnaut | 2010-04-09 | 1 | -0/+2 |
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+13 |
| |\ \ | | |/ | |||||
| * | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -0/+10 |
| |\ \ | |||||
| * \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -2/+5 |
| |\ \ \ | |||||
| * \ \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| * | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -0/+10 |
* | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -8/+0 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-02-23 | 1 | -0/+14 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Add ignore pattern for valgrind messages. | Alexander Nozdrin | 2010-02-23 | 1 | -0/+2 |
* | | | | | | | fixed wrong merge conflict in mysql-test/include/mtr_warnings.sql | Bjorn Munch | 2010-02-16 | 1 | -0/+1 |
* | | | | | | | new merge from next-mr | Bjorn Munch | 2010-02-16 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| * | | | | | | | Backport of revno: 2617.68.18 | Jon Olav Hauglid | 2009-12-09 | 1 | -0/+8 |
| * | | | | | | | new merge from next-mr | Bjorn Munch | 2009-10-22 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | upmerge 50414 | Bjorn Munch | 2010-02-03 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Bug #50414 valgrind warnings: invalid file descriptor -1 in syscall | unknown | 2010-02-03 | 1 | -0/+6 |
* | | | | | | | | | upmerge | Bjorn Munch | 2009-12-16 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge from 5.1 main | Bjorn Munch | 2009-12-16 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
* | | | | | | | | | merge from trunk | Bjorn Munch | 2009-12-16 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | |