Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic merge | Michael Widenius | 2012-03-28 | 1 | -2/+2 |
|\ | |||||
| * | Merge with 5.1 | Michael Widenius | 2012-03-28 | 1 | -2/+2 |
| |\ | |||||
| | * | Fixed lp:944422 "mysql_upgrade destroys Maria tables?" | Michael Widenius | 2012-03-28 | 1 | -2/+2 |
* | | | Added Handler_read_rnd_deleted, number of deleted rows found with ha_read_rnd... | Michael Widenius | 2012-01-13 | 1 | -0/+2 |
* | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -10/+50 |
|\ \ \ | |/ / | |||||
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -10/+50 |
| |\ \ | | |/ | |||||
| | * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -1/+19 |
| | |\ | |||||
| | | * | Bug#11766879/Bug#60106: DIFF BETWEEN # OF INDEXES IN MYSQL VS INNODB, | Mattias Jonsson | 2011-08-23 | 1 | -1/+19 |
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -9/+31 |
| | |\ \ | | | |/ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -140/+317 |
| | | |\ | |||||
| | | | * | merge | Mattias Jonsson | 2011-06-13 | 1 | -3/+8 |
| | | | |\ | |||||
| | | | | * | bug#11765667: bug#58655: ASSERTION FAILED, SERVER CRASHES WITH MYSQLD GOT SIG... | Mattias Jonsson | 2011-04-29 | 1 | -3/+8 |
| | | | * | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -2/+6 |
| | | | * | | Merge from mysql-5.1.57-release | Karen Langford | 2011-05-06 | 1 | -1/+9 |
| | | | |\ \ | | | | | |/ | | | | |/| | |||||
| | | | | * | Bug#11867664: Fix server crashes on update with join on partitioned table. | unknown | 2011-04-12 | 1 | -1/+9 |
| | | | * | | removed dead obsolete code | Mattias Jonsson | 2011-04-29 | 1 | -6/+0 |
| | | | * | | Post push fix for bug#11766249 bug#59316 | Mattias Jonsson | 2011-04-27 | 1 | -3/+6 |
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
* | | | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_write | Michael Widenius | 2011-06-27 | 1 | -4/+4 |
* | | | | | | Merge 5.2 -> 5.3 | Sergey Petrunya | 2011-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fixes BUG#60976 "Crash, valgrind warning and memory leak with partitioned arc... | Michael Widenius | 2011-06-11 | 1 | -1/+1 |
* | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -8/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | db_low_byte_first is gone | Sergei Golubchik | 2011-05-20 | 1 | -8/+0 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -134/+305 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -134/+305 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -134/+305 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | post fix for werror build for bug#11766249. | Mattias Jonsson | 2011-04-26 | 1 | -5/+5 |
| | | * | | | merge | Mattias Jonsson | 2011-04-20 | 1 | -122/+284 |
| | | |\ \ \ | | | | |_|/ | | | |/| | | |||||
| | | | * | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-04-20 | 1 | -129/+177 |
| | | | * | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-03-25 | 1 | -58/+172 |
| | | * | | | Bug#59297: Can't find record in 'tablename' on update inner join | Mattias Jonsson | 2011-01-24 | 1 | -0/+1 |
| | | |/ / | |||||
| | | * | | merge | Georgi Kodinov | 2010-11-26 | 1 | -2/+8 |
| | | |\ \ | |||||
* | | | \ \ | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -10/+102 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -10/+102 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with main | Michael Widenius | 2011-02-22 | 1 | -3/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | Fixed bug in federatedx patch that caused partition tests to fail. | Michael Widenius | 2011-02-11 | 1 | -5/+7 |
| | * | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -8/+43 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| | | |||||
| | | * | | | Auto-merge from mysql-5.1-bugteam. | Ramil Kalimullin | 2010-11-18 | 1 | -2/+35 |
| | | |\ \ \ | | | | |/ / | | | | | / | | | | |/ | | | |/| | |||||
| | | | * | Bug#57890: Assertion failed: next_insert_id == 0 | Mattias Jonsson | 2010-11-11 | 1 | -2/+35 |
| | * | | | Applied patch for lp:585688 "maridb crashes in federatedx code" from lp:~atcu... | Michael Widenius | 2011-02-10 | 1 | -9/+65 |
| * | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -2/+4 |
| |\ \ \ \ | |||||
| | * | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -2/+4 |
* | | | | | | Merge | Igor Babaev | 2010-12-27 | 1 | -41/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | When compiling with valgrind, change my_alloca() to use my_malloc() | Michael Widenius | 2010-12-13 | 1 | -2/+2 |
| * | | | | | Fix wrong merge of patch for Bug#46639. | unknown | 2010-12-10 | 1 | -39/+0 |
* | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -21/+86 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -21/+86 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -2/+8 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | merging. | Alexey Botchkov | 2010-10-15 | 1 | -2/+6 |
| | | |\ \ | |||||
| | | | * | | Bug#55146 Assertion `m_part_spec.start_part == m_part_spec.end_part' in ... | Alexey Botchkov | 2010-08-12 | 1 | -2/+6 |