Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge mysql-5.5-innodb -> mysql-5.5 | Vasil Dimov | 2011-05-22 | 10 | -56/+131 |
|\ | |||||
| * | Fix a bogus UNIV_SYNC_DEBUG failure in the fix of Bug #59641 | Marko Mäkelä | 2011-05-18 | 1 | -3/+0 |
| * | Bug#12543706 - innodb-fast-shutdown=2: Assert | Marko Mäkelä | 2011-05-17 | 1 | -1/+2 |
| * | A non-functional change related to Bug#11830883 | Marko Mäkelä | 2011-05-09 | 5 | -39/+36 |
| * | Merge from mysql-5.1-innodb to mysql-5.5-innodb | Jimmy Yang | 2011-05-04 | 2 | -10/+83 |
| |\ | |||||
| | * | Fix bug #11796673 address backward compatibility on index with | Jimmy Yang | 2011-05-04 | 2 | -12/+115 |
| * | | Fix bug #12424282 - INNODB PERFORMANCE SCHEMA: Double accounting for OS_AIO_SYNC | Jimmy Yang | 2011-05-04 | 1 | -3/+10 |
* | | | merge from latest 5.5 | Guilhem Bichot | 2011-05-21 | 1 | -2/+2 |
|\ \ \ | |||||
| * \ \ | merge | Mikael Ronström | 2011-05-12 | 2 | -20/+24 |
| |\ \ \ | |||||
| * \ \ \ | merge | Mikael Ronstrom | 2011-05-04 | 40 | -545/+594 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Merge 5.5, step 3 | Mikael Ronström | 2011-04-15 | 4 | -4/+2 |
| * | | | | Merge 5.5 | Mikael Ronström | 2011-04-15 | 55 | -1084/+965 |
| |\ \ \ \ | |||||
| * \ \ \ \ | merge | Mikael Ronstrom | 2011-03-04 | 42 | -413/+2007 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merge | Mikael Ronström | 2011-02-10 | 46 | -562/+1035 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge | Mikael Ronstrom | 2011-01-20 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Removed dependency no longer correct | Mikael Ronstrom | 2011-01-12 | 3 | -17/+0 |
| * | | | | | | | | merge | Mikael Ronstrom | 2011-01-12 | 63 | -818/+1571 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | BUG#59392, removed thread local storage use in MySQL Threads by storing ibuf_... | Mikael Ronstrom | 2011-01-12 | 13 | -125/+65 |
| * | | | | | | | | | merge | Mikael Ronstrom | 2011-01-04 | 305 | -26762/+4185 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Added more wait states for THD wait service | Mikael Ronstrom | 2010-10-27 | 1 | -2/+2 |
* | | | | | | | | | | | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge from mysql-5.1.57-release | Karen Langford | 2011-05-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | merged mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-04-07 | 20 | -130/+327 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | merge 5.1->5.1-security | Georgi Kodinov | 2011-03-09 | 17 | -14/+943 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ \ | Merge from mysql-5.5.12-release | unknown | 2011-05-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | merge 5.5->5.5-security | Georgi Kodinov | 2011-04-07 | 44 | -1156/+949 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | merged mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-03-17 | 2 | -5/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-03-09 | 52 | -417/+2036 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge. | Sergey Vojtovich | 2011-03-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | BUG#11764339 - valgrind errors, random data when returning | Sergey Vojtovich | 2011-03-03 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | BUG#11762616: BUG#55229: 'POSTION' | Luis Soares | 2011-05-06 | 2 | -19/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | BUG#11762616: BUG#55229: 'POSTION' | Luis Soares | 2011-05-06 | 2 | -19/+23 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge mysql-5.1-innodb -> mysql-5.1 | Vasil Dimov | 2011-05-02 | 14 | -152/+275 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mysql-5.5-innodb -> mysql-5.5 | Vasil Dimov | 2011-05-02 | 8 | -32/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Bug#60309 - Bug#12356829: MYSQL 5.5.9 FOR MAC OSX HAS BUG WITH FOREIGN KEY C... | unknown | 2011-04-26 | 8 | -32/+43 |
* | | | | | | | | | | | | | | | | merge | Mattias Jonsson | 2011-04-23 | 6 | -10/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Manual merge from 5.1 | Mattias Jonsson | 2011-04-20 | 6 | -10/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | / / / / / / / / | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | merge | Mattias Jonsson | 2011-04-20 | 6 | -12/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-03-25 | 6 | -12/+12 |
| | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge mysql-5.5-innodb -> mysql-5.5 | Vasil Dimov | 2011-04-21 | 30 | -526/+546 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Clarify a comment. | Marko Mäkelä | 2011-04-20 | 1 | -2/+2 |
| * | | | | | | | | | | | | | Remove a debug printout that is no longer needed. | Marko Mäkelä | 2011-04-20 | 1 | -12/+1 |
| * | | | | | | | | | | | | | Bug #12329920 ASSERT UT_ERROR IN SYNC_THREAD_LEVELS_NONEMPTY_TRX | Marko Mäkelä | 2011-04-12 | 1 | -22/+22 |
| * | | | | | | | | | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb. | Marko Mäkelä | 2011-04-11 | 9 | -78/+199 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Bug #11760042 - 52409: Assertion failure: long semaphore wait | Marko Mäkelä | 2011-04-11 | 5 | -138/+108 |
| | * | | | | | | | | | | | | Bug #11766513 - 59641: Prepared XA transaction in system after hard crash | Marko Mäkelä | 2011-04-07 | 12 | -14/+167 |
| | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge mysql-5.1-innodb -> mysql-5.1 | Vasil Dimov | 2011-04-04 | 14 | -129/+234 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1 | Magne Mahre | 2011-03-28 | 6 | -1/+93 |
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Increment InnoDB version from 1.1.6 to 1.1.7 | Vasil Dimov | 2011-04-08 | 1 | -1/+1 |
| * | | | | | | | | | | | | Non-functional change: move a printout | Marko Mäkelä | 2011-04-06 | 2 | -11/+8 |