Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -0/+45 |
|\ | |||||
| * | Merge 5.1-security => 5.5-security | Tor Didriksen | 2012-01-27 | 1 | -0/+45 |
| |\ | |||||
| | * | Bug#13580775 ASSERTION FAILED: RECORD_LENGTH == M_RECORD_LENGTH | Tor Didriksen | 2012-01-27 | 1 | -0/+45 |
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -0/+17 |
|\ \ \ | |||||
| * | | | BUG#598247: partition.test produces valgrind errors in 5.3-based branches | Sergey Petrunya | 2011-06-15 | 1 | -0/+19 |
| * | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+43 |
| |\ \ \ | |||||
| * \ \ \ | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -2/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -0/+49 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -4/+153 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | merge | Mattias Jonsson | 2011-06-13 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Bug#11746819: | Mattias Jonsson | 2011-03-16 | 1 | -0/+6 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | merge | Mattias Jonsson | 2011-06-13 | 1 | -0/+31 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | bug#11765667: bug#58655: ASSERTION FAILED, SERVER CRASHES WITH MYSQLD GOT SIG... | Mattias Jonsson | 2011-04-29 | 1 | -0/+31 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | merge | Mattias Jonsson | 2011-03-09 | 1 | -0/+43 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug#59297: Can't find record in 'tablename' on update inner join | Mattias Jonsson | 2011-01-24 | 1 | -0/+43 |
| | |/ / / | |||||
| * | | | | BUG#11762751: UPDATE STATEMENT THROWS AN ERROR, BUT STILL | Jorgen Loland | 2011-02-21 | 1 | -0/+50 |
| * | | | | Manual merge from 5.1 | Mattias Jonsson | 2011-01-10 | 1 | -2/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug#54483: valgrind errors when making warnings for multiline inserts into pa... | Mattias Jonsson | 2010-12-22 | 1 | -2/+3 |
| | | |/ | | |/| | |||||
| * | | | Bug#57778: failed primary key add to partitioned innodb table inconsistent an... | Mattias Jonsson | 2010-11-05 | 1 | -0/+18 |
| * | | | merge | Mattias Jonsson | 2010-10-01 | 1 | -0/+22 |
| |\ \ \ | | |/ / | |||||
| * | | | merge | Mattias Jonsson | 2010-10-01 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Bug#50036: Inconsistent errors when using TIMESTAMP columns/expressions | Mattias Jonsson | 2010-08-30 | 1 | -2/+2 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -0/+4 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+13 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -0/+23 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -0/+47 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Speed up of test suite: | Michael Widenius | 2009-10-28 | 1 | -0/+4 |
* | | | | | | | | | | mysql-5.1 -> mysql-5.5 merge | Sergei Golubchik | 2010-11-05 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Bug#55458: Partitioned MyISAM table gets crashed by multi-table update | Mattias Jonsson | 2010-09-30 | 1 | -0/+22 |
* | | | | | | | | | merge | Mattias Jonsson | 2010-09-13 | 1 | -0/+28 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Bug#55458: Partitioned MyISAM table gets crashed by multi-table update | Mattias Jonsson | 2010-08-10 | 1 | -0/+27 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2010-05-28 | 1 | -0/+12 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-05-20 | 1 | -0/+44 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-03 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | BUG#51868 - crash with myisam_use_mmap and partitioned | Sergey Vojtovich | 2010-03-22 | 1 | -0/+13 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
* | | | | | | | | merge | Mattias Jonsson | 2010-05-25 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Bug#39338: Fieldnames in INFORMATIONSCHEMA.PARTITIONS.PARTITION_EXPRESSION | Mattias Jonsson | 2009-02-18 | 1 | -0/+23 |
* | | | | | | | | Backport test cases for Bug#46198 and Bug#38054 | Alexander Nozdrin | 2010-05-19 | 1 | -0/+45 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | | * | | | | | | Post-merge test fix for bug #42849. | Alexey Kopytov | 2009-12-14 | 1 | -3/+3 |
| | | | |_|_|_|/ | | | |/| | | | | |||||
* | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -0/+23 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -3/+3 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | merge | Mattias Jonsson | 2009-11-17 | 1 | -0/+11 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | backport of bug#45904 from mysql-pe to 5.1 | Mattias Jonsson | 2009-11-17 | 1 | -0/+11 |
| | | | |_|_|_|/ | | | |/| | | | | |||||
| | * | | | | | | merge | Mattias Jonsson | 2009-11-17 | 1 | -0/+9 |
| | |\ \ \ \ \ \ |