Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+24 |
|\ | |||||
| * | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+24 |
| |\ | |||||
| | * | Update of copyright headers for files I changed this year. | Mattias Jonsson | 2011-01-27 | 1 | -1/+1 |
| | * | merge | Mattias Jonsson | 2011-01-26 | 1 | -0/+22 |
| | |\ | |||||
| | | * | Bug#57924: crash when creating partitioned table with | Mattias Jonsson | 2011-01-10 | 1 | -0/+22 |
* | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -8/+31 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with main | Michael Widenius | 2011-02-22 | 1 | -0/+3 |
| |\ \ \ | |||||
| | * | | | Fixed bug in federatedx patch that caused partition tests to fail. | Michael Widenius | 2011-02-11 | 1 | -0/+3 |
| * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -8/+28 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * | | Bug#54483: valgrind errors when making warnings for | Mattias Jonsson | 2010-12-22 | 1 | -5/+6 |
| | * | | Bug#54483: valgrind errors when making warnings for multiline inserts into pa... | Mattias Jonsson | 2010-12-22 | 1 | -1/+1 |
| | * | | Auto-merge from mysql-5.1-bugteam. | Ramil Kalimullin | 2010-11-18 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure | Davi Arnaut | 2010-11-10 | 1 | -2/+2 |
| | * | | merge | Mattias Jonsson | 2010-11-15 | 1 | -1/+20 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Bug#55091: Server crashes on ADD PARTITION after a failed attempt | Mattias Jonsson | 2010-10-05 | 1 | -1/+20 |
* | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 1 | -2/+2 |
| | |/ | |||||
* | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | BUG#49124 Security issue with /*!-versioned */ SQL statements on Slave | unknown | 2010-07-29 | 1 | -1/+1 |
* | | | Added extra argument to longlong2str() to make it have same prototype is int2... | Michael Widenius | 2010-08-07 | 1 | -1/+1 |
* | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -36/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -36/+6 |
| |\ \ | | |/ | |||||
| | * | Bug #42064: low memory crash when importing hex strings, in | Alexey Kopytov | 2010-05-21 | 1 | -1/+3 |
| | * | Bug#50561: ALTER PARTITIONS does not have adequate lock, breaks with | Mattias Jonsson | 2010-03-17 | 1 | -35/+3 |
* | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -4/+16 |
|\ \ \ | |/ / | |||||
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -4/+16 |
| |\ \ | | |/ | |||||
| | * | merge | Mattias Jonsson | 2010-03-12 | 1 | -2/+9 |
| | |\ | |||||
| | | * | Bug#51830: Incorrect partition pruning on range partition | Mattias Jonsson | 2010-03-10 | 1 | -2/+9 |
| | * | | Bug#50104: Partitioned table with just 1 partion works with fk | Mattias Jonsson | 2010-03-04 | 1 | -0/+6 |
| | |/ | |||||
* | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -38/+62 |
|\ \ \ | |/ / | |||||
| * | | A number of after-merge fixes following merge of MySQL 5.1.44 into MariaDB. | unknown | 2010-03-09 | 1 | -2/+3 |
| * | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -38/+61 |
| |\ \ | | |/ | |||||
| | * | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -2/+3 |
| | * | merge | Mattias Jonsson | 2010-01-19 | 1 | -5/+3 |
| | |\ | |||||
| | | * | Bug#47343: InnoDB fails to clean-up after lock wait timeout on | Mattias Jonsson | 2010-01-18 | 1 | -5/+3 |
| | * | | Bug#49742: Partition Pruning not working correctly for RANGE | Mattias Jonsson | 2009-12-22 | 1 | -25/+22 |
| | |/ | |||||
| | * | Automerge | Alexey Kopytov | 2009-12-13 | 1 | -6/+33 |
| | |\ | |||||
| | | * | Bug #42849: innodb crash with varying time_zone on partitioned | Alexey Kopytov | 2009-12-13 | 1 | -6/+33 |
* | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -16/+29 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -16/+29 |
| |\ \ \ | | |/ / | |||||
| | * | | merge | Mattias Jonsson | 2009-11-17 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | backport of bug#45904 from mysql-pe to 5.1 | Mattias Jonsson | 2009-11-17 | 1 | -1/+1 |
| | * | | | merge | Mattias Jonsson | 2009-11-17 | 1 | -15/+16 |
| | |\ \ \ | |||||
| | | * | | | Bug#48276: can't add column if subpartition exists | Mattias Jonsson | 2009-11-09 | 1 | -15/+16 |
| | | |/ / | |||||
| | * | | | merge | Mattias Jonsson | 2009-11-17 | 1 | -0/+12 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Bug#46923: select count(*) from partitioned table fails with | Mattias Jonsson | 2009-11-03 | 1 | -0/+12 |
* | | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -5/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -5/+4 |
| |\ \ \ \ | | |/ / / |