Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -149/+212 |
|\ | |||||
| * | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -7/+35 |
| |\ | |||||
| | * | Fixed compiler warnings and other bugs found by buildbot. | Michael Widenius | 2011-11-30 | 1 | -7/+35 |
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -142/+179 |
| |\ \ | | |/ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -143/+178 |
| | |\ | |||||
| | | * | merge from latest 5.1 | Guilhem Bichot | 2011-05-21 | 1 | -140/+180 |
| | | |\ | |||||
| | | | * | Fixed bug#11749345 (formerly bug#38813) - increasing memory consumption | Dmitry Shulga | 2011-05-20 | 1 | -140/+180 |
| | | * | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -1/+1 |
| | | |/ | |||||
| | * | | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 1 | -1/+3 |
* | | | | BUG#882472: subselect4.test fails in current 5.3 | Sergey Petrunya | 2011-10-27 | 1 | -2/+2 |
* | | | | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 1 | -1/+3 |
* | | | | merge | Sergei Golubchik | 2011-10-11 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed that when using a trigger mysql.proc is now accessed | Michael Widenius | 2011-10-06 | 1 | -1/+1 |
* | | | | Allow one to block an account by using GRANT max_user_connections = -1 | Michael Widenius | 2011-09-26 | 1 | -1/+1 |
* | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -4/+2 |
* | | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -2/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -2/+6 |
* | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -3/+47 |
* | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_write | Michael Widenius | 2011-06-27 | 1 | -1/+1 |
* | | | | Merge of mwl #106 into 5.3. | Igor Babaev | 2011-06-15 | 1 | -7/+11 |
|\ \ \ \ | |||||
| * \ \ \ | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -7/+11 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge | Igor Babaev | 2011-05-20 | 1 | -7/+11 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -7/+11 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -7/+11 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -7/+11 |
* | | | | | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -21/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -21/+16 |
* | | | | | | | | | | Fixed that SHOW COLUMNS for a virtual persistent column shows 'PERSISTENT' in... | Michael Widenius | 2011-06-06 | 1 | -2/+6 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge 5.3->main -> 5.3-mwl90 | Sergey Petrunya | 2011-05-29 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge MWL#90 with main 5.3 tree | Sergey Petrunya | 2011-04-02 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Make first_linear_tab()/next_linear_tab() use named constants instead of TRUE... | Sergey Petrunya | 2011-03-25 | 1 | -2/+2 |
| | * | | | | | | | | MWL#90: Address review feedback part #4 | Sergey Petrunya | 2011-03-22 | 1 | -2/+0 |
| | * | | | | | | | | MWL#90: Address review feedback part #1 | Sergey Petrunya | 2011-03-19 | 1 | -3/+0 |
| | * | | | | | | | | Merge 5.3 -> 5.3-subqueries-mwl90 | Sergey Petrunya | 2011-03-01 | 1 | -4/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | MWL#90: Subqueries: Inside-out execution for materialized non-sj subqueries | Sergey Petrunya | 2011-02-15 | 1 | -2/+8 |
* | | | | | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -27/+46 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -24/+43 |
* | | | | | | | | | | Merge with 5.2 | Michael Widenius | 2011-05-16 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | merge | Vladislav Vaintroub | 2011-05-12 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | * | | | | | | | | db_name can change case, so we need copy of it for case insensitive FS. | Oleksandr Byelkin | 2011-05-12 | 1 | -2/+8 |
* | | | | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -5/+4 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | / / / / / / | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -5/+4 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -5/+4 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | Bug #11758687: 50924: object names not resolved correctly | Georgi Kodinov | 2011-04-04 | 1 | -5/+7 |
* | | | | | | | | | Added item.real_type() for easy access to the underlaying types for Item_ref ... | Michael Widenius | 2011-03-09 | 1 | -4/+1 |
* | | | | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -32/+50 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -29/+40 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -29/+40 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Updating header copyright/README in source for 2011 | Karen Langford | 2011-01-25 | 1 | -1/+1 |
| | | * | | | | | Merge mysql-5.1 -> mysql-5.1-innodb | Vasil Dimov | 2011-01-07 | 1 | -1/+1 |
| | | |\ \ \ \ \ |