Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -32/+7 |
|\ | |||||
| * | Rewrite IGNORE handling: | Michael Widenius | 2011-12-11 | 1 | -11/+2 |
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -5/+26 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -5/+26 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -5/+26 |
| | | |\ | |||||
* | | | | | small cleanup | Sergei Golubchik | 2011-11-28 | 1 | -9/+1 |
* | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -31/+88 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -4/+37 |
| * | | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -1/+13 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -1/+13 |
| * | | | | Merge 5.2->5.3 | unknown | 2011-09-02 | 1 | -25/+37 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | LP BUG#823169 fix. | unknown | 2011-09-02 | 1 | -24/+36 |
| | * | | | Added logging of all messages (also system warnings) one gets during a MyISAM... | Michael Widenius | 2011-08-29 | 1 | -1/+1 |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -18/+27 |
|\ \ \ \ \ | |||||
| * | | | | | Backporting fix from trunk (revid 3381), original comment: | Bjorn Munch | 2011-08-24 | 1 | -1/+1 |
| * | | | | | Cherry-picking patch for 12777649 from mysql-5.5 | Alexander Nozdrin | 2011-08-15 | 1 | -2/+2 |
| * | | | | | 5.1 -> 5.5 merge | Sergey Glukhov | 2011-08-02 | 1 | -1/+0 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN... | Sergey Glukhov | 2011-08-02 | 1 | -1/+0 |
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -4/+23 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | merge from latest 5.1 | Guilhem Bichot | 2011-05-21 | 1 | -0/+19 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDED | Mayank Prasad | 2011-05-18 | 1 | -0/+19 |
| | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| * | | | | | | | | Bug#12756017 - PROFILING: SET_THD_PROC_INFO DOES NOT NEED TO CALL DIRNAME_LEN... | Tor Didriksen | 2011-07-20 | 1 | -3/+3 |
| * | | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -11/+21 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix for bug #12641342 - "61401: UPDATE PERFORMANCE DEGRADES | Dmitry Lenev | 2011-06-16 | 1 | -9/+17 |
| |/ / / / / / / / | |||||
* | | | | | | | | | bugfix: progress reporting and sub-statements | Sergei Golubchik | 2011-10-19 | 1 | -5/+12 |
* | | | | | | | | | safe_mutex deadlock detector post-merge fixes | Sergei Golubchik | 2011-10-19 | 1 | -0/+5 |
* | | | | | | | | | Id column in EXPLAIN can be null. | Sergei Golubchik | 2011-10-19 | 1 | -1/+2 |
* | | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -50/+252 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | Automatic merge with 5.2 | Michael Widenius | 2011-08-16 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | Fixed bug that MAX_USER_CONNECTIONS was not working properly in all situation... | Michael Widenius | 2011-08-16 | 1 | -0/+5 |
| * | | | | | | | | Merge with the latest 5.3 code. | Igor Babaev | 2011-07-11 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fixed LP bug #794890. | Igor Babaev | 2011-06-13 | 1 | -0/+1 |
| * | | | | | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -0/+119 |
| * | | | | | | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_write | Michael Widenius | 2011-06-27 | 1 | -0/+2 |
| * | | | | | | | | | Fixed LP bug #798576. | Igor Babaev | 2011-06-24 | 1 | -0/+1 |
| * | | | | | | | | | Merge of mwl #106 into 5.3. | Igor Babaev | 2011-06-15 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge | Igor Babaev | 2011-05-20 | 1 | -1/+3 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -1/+3 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -1/+3 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -1/+3 |
| * | | | | | | | | | | | | | Merge with 5.2 | Michael Widenius | 2011-06-10 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | / / / / / / / | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed problem that global status variables 'bytes_recieved' and 'binlog_bytes... | Michael Widenius | 2011-06-09 | 1 | -2/+2 |
| * | | | | | | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -7/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | post review changes 2 | Sergei Golubchik | 2011-05-19 | 1 | -1/+2 |
| | * | | | | | | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -4/+4 |
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge with 5.3 main | Michael Widenius | 2011-05-16 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | MWL#89 | unknown | 2011-05-02 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ |