Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -4/+9 |
|\ | |||||
| * | Rewrite IGNORE handling: | Michael Widenius | 2011-12-11 | 1 | -4/+9 |
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -60/+163 |
| |\ | |||||
| | * | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -3/+3 |
| | |\ | |||||
| | | * | Fixed compiler warnings and other bugs found by buildbot. | Michael Widenius | 2011-11-30 | 1 | -3/+3 |
| | * | | Merge with 5.1 + fixes for build failures in 5.2 | Michael Widenius | 2011-11-29 | 1 | -2/+3 |
| | |\ \ | | | |/ | |||||
| | * | | after merge fixes | Sergei Golubchik | 2011-11-28 | 1 | -2/+8 |
| | * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -55/+151 |
| | |\ \ | | | |/ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -52/+152 |
| | | |\ | |||||
| | | | * | Merge. | Sergey Vojtovich | 2011-08-24 | 1 | -42/+141 |
| | | | |\ | |||||
| | | | | * | BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILD | Sergey Vojtovich | 2011-08-18 | 1 | -42/+141 |
* | | | | | | moved ha_maria::implicit_commit() calls around | Sergei Golubchik | 2012-01-06 | 1 | -5/+0 |
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-27 | 1 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fixed LP bug #892725. | Igor Babaev | 2011-11-20 | 1 | -0/+2 |
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -10/+22 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fix MySQL BUG#12329653 | unknown | 2011-11-12 | 1 | -2/+2 |
| * | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -2/+2 |
| * | | | | | BUG#849763: Wrong result with second execution of prepared statement with sem... | Sergey Petrunya | 2011-09-20 | 1 | -1/+15 |
| * | | | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -2/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -2/+2 |
| * | | | | | Merge of merge | unknown | 2011-09-02 | 1 | -2/+3 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge 5.2->5.3 | unknown | 2011-09-02 | 1 | -2/+3 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Added logging of all errors from my_read/my_write/my_pread/my_pwrite/my_open ... | Michael Widenius | 2011-09-02 | 1 | -2/+3 |
| * | | | | | | BUG#834534: Assertion `0' failed in replace_where_subcondition with semijoin ... | Sergey Petrunya | 2011-08-29 | 1 | -5/+2 |
| |/ / / / / | |||||
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -4/+81 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | 5.1 -> 5.5 merge | Sergey Glukhov | 2011-08-02 | 1 | -4/+4 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN... | Sergey Glukhov | 2011-08-02 | 1 | -4/+4 |
| * | | | | | | Fix for bug #11754210 - "45777: CHECK TABLE DOESN'T | Dmitry Lenev | 2011-07-22 | 1 | -0/+77 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -167/+309 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Fixed LP bug #825035. | Igor Babaev | 2011-08-16 | 1 | -0/+1 |
| * | | | | | | Fixed LP BUG#800696. | unknown | 2011-07-19 | 1 | -5/+0 |
| * | | | | | | Merge with the latest 5.3 code. | Igor Babaev | 2011-07-11 | 1 | -3/+12 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fixed LP bug #794890. | Igor Babaev | 2011-06-13 | 1 | -3/+12 |
| * | | | | | | | Fixed LP bug #793386. | Igor Babaev | 2011-07-11 | 1 | -0/+5 |
| * | | | | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_write | Michael Widenius | 2011-06-27 | 1 | -2/+2 |
| * | | | | | | | Fixed a valgrind problem. | Igor Babaev | 2011-06-23 | 1 | -3/+10 |
| * | | | | | | | Merge of mwl #106 into 5.3. | Igor Babaev | 2011-06-15 | 1 | -69/+153 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -69/+153 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fix of privilege problem in views and PS | Oleksandr Byelkin | 2011-06-02 | 1 | -1/+1 |
| | | * | | | | | | Merge | Igor Babaev | 2011-05-20 | 1 | -61/+141 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -61/+141 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -61/+138 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * | | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -61/+138 |
| * | | | | | | | | | | | Fixed that SHOW COLUMNS for a virtual persistent column shows 'PERSISTENT' in... | Michael Widenius | 2011-06-06 | 1 | -4/+0 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge 5.3->main -> 5.3-mwl90 | Sergey Petrunya | 2011-05-29 | 1 | -5/+25 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Update pbxt suite test results | Sergey Petrunya | 2011-05-29 | 1 | -1/+1 |
| | * | | | | | | | | | - Update test results (trivial) | Sergey Petrunya | 2011-05-29 | 1 | -22/+0 |
| | * | | | | | | | | | Buildbot fixes: | Sergey Petrunya | 2011-05-29 | 1 | -2/+4 |
| | * | | | | | | | | | post-merge fixes: get MWL#90 code to work with MWL#89's | Sergey Petrunya | 2011-05-28 | 1 | -4/+32 |
| | * | | | | | | | | | Merge MWL#90 with 5.3-main | Sergey Petrunya | 2011-05-25 | 1 | -1/+13 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | |