Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed build failures found by buildbot | Michael Widenius | 2012-06-05 | 1 | -1/+1 |
* | mysql 5.5.23 merge | Sergei Golubchik | 2012-04-10 | 1 | -92/+175 |
|\ | |||||
| * | Merge the 5.5.22 release build into main 5.5, | Joerg Bruehe | 2012-03-20 | 1 | -8/+4 |
| |\ | |||||
| * \ | merge of bug#1364811 into mysql-5.5 | Mattias Jonsson | 2012-03-14 | 1 | -91/+174 |
| |\ \ | |||||
| | * | | bug#13694811 | Mattias Jonsson | 2012-03-14 | 1 | -10/+4 |
| | * | | Bug#13694811: THE OPTIMIZER WRONGLY USES THE FIRST INNODB | Mattias Jonsson | 2012-02-22 | 1 | -105/+195 |
| * | | | merge from mysql-5.1 | Mattias Jonsson | 2012-02-29 | 1 | -33/+33 |
| |\ \ \ | |||||
| | * \ \ | merge into mysql-5.1 | Mattias Jonsson | 2012-02-29 | 1 | -15/+15 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Bug#11761296: 53775: QUERY ON PARTITIONED TABLE RETURNS CACHED | Mattias Jonsson | 2012-02-20 | 1 | -14/+14 |
| | |/ / | |||||
* | | | | Merge of compatibility fixes | Michael Widenius | 2012-04-02 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | 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 |
* | | | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -8/+4 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Bug#13593865 - 64037: CRASH IN HA_PARTITION::CREATE_HANDLERS ON | Mattias Jonsson | 2012-02-02 | 1 | -40/+36 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -0/+2 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Added Handler_read_rnd_deleted, number of deleted rows found with ha_read_rnd... | Michael Widenius | 2012-01-13 | 1 | -0/+2 |
* | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -45/+158 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-10-12 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| * | | | | | | Bug#12696518: MEMORY LEAKS IN HA_PARTITION (VALGRIND TESTS ON TRUNK) | Mattias Jonsson | 2011-09-15 | 1 | -44/+158 |
* | | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | 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 |
| | | | |\ \ \ | |||||
| | | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
* | | | | | | | | move safemalloc out of dbug. | Sergei Golubchik | 2011-12-12 | 1 | -0/+1 |
* | | | | | | | | merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -1/+1 |
* | | | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 1 | -1/+2 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -4/+11 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -65/+94 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | 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 |
| | | |\ \ \ \ \ | |||||
| * | | \ \ \ \ \ | 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 |
| | | | |\ \ \ \ \ | |||||
| | | * | | | | | | | Applied patch for lp:585688 "maridb crashes in federatedx code" from lp:~atcu... | Michael Widenius | 2011-02-10 | 1 | -9/+65 |