Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | WL#3230 concurrent hash | Marc Alff | 2009-11-17 | 11 | -4/+1713 |
* | Misc cleanup | Marc Alff | 2009-11-17 | 2 | -97/+1 |
* | WL#2595 kernel-independent atomic operations | Marc Alff | 2009-11-17 | 14 | -282/+675 |
* | Merge mysql-next-mr (revno 2922) --> mysql-next-mr-marc | Marc Alff | 2009-11-16 | 215 | -1561/+4902 |
|\ | |||||
| * | Update version tag (new: 5.6). | Alexander Nozdrin | 2009-11-12 | 2 | -2/+2 |
| * | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-11-12 | 1 | -2/+3 |
| |\ | |||||
| | * | Auto-merge from mysql-trunk-bugfixing. | Alexander Nozdrin | 2009-11-12 | 2 | -3/+4 |
| | |\ | |/ / | |||||
| | * | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-11-12 | 4 | -12/+14 |
| | |\ | | |/ | |/| | |||||
| * | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-12 | 206 | -1545/+4733 |
| |\ \ | |||||
| * | | | test updated | Alexey Botchkov | 2009-11-11 | 2 | -7/+0 |
| * | | | loadxml test update. | Alexey Botchkov | 2009-11-11 | 2 | -1/+2 |
| * | | | Bug #47139 Test "merge" crashes in "embedded" run | Alexey Botchkov | 2009-11-11 | 1 | -2/+5 |
| * | | | Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sq... | Alexey Botchkov | 2009-11-11 | 3 | -5/+10 |
| | | * | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-11-12 | 1155 | -33501/+68021 |
| | | |\ | | | |/ | | |/| | |||||
| | * | | Fix build failure. | Alexander Nozdrin | 2009-11-10 | 2 | -1/+8 |
| | * | | Auto-merge from mysql-next-mr-alik. | Alexander Nozdrin | 2009-11-10 | 7 | -1/+151 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge BUG#48161, BUG#48447 | Mikael Ronstrom | 2009-11-06 | 7 | -1/+151 |
| |\ \ \ | |||||
| | * | | | Review fixes for BUG#48161 and BUG#48447 | Mikael Ronstrom | 2009-11-06 | 4 | -32/+55 |
| | * | | | BUG#48447, BUG#48161, fixed a regression from fix of BUG#6045, where binary c... | Mikael Ronstrom | 2009-11-05 | 5 | -1/+128 |
| | | * | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-10 | 65 | -1109/+2248 |
| | | |\ \ | | |_|/ / | |/| | | | |||||
| | | * | | Fix manual-merge (2nd attempt). | Alexander Nozdrin | 2009-11-10 | 1 | -2/+0 |
| | | * | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-09 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | Fix innodb.test due to Bug#48636. | Alexander Nozdrin | 2009-11-09 | 1 | -1/+1 |
| | | * | | | Fix manual-merge. | Alexander Nozdrin | 2009-11-09 | 1 | -28/+21 |
| | | * | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 2 | -6/+10 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 11 | -16/+548 |
| | | | |\ \ | |||||
| | | | | * | | Raise version number after cloning 5.1.41 | unknown | 2009-11-04 | 1 | -1/+1 |
| | | | | * | | merge | Georgi Kodinov | 2009-11-04 | 1 | -1/+1 |
| | | | | |\ \ | |||||
| | | | | | * | | version change | Georgi Kodinov | 2009-11-04 | 1 | -1/+1 |
| | | | | * | | | merge | Georgi Kodinov | 2009-11-04 | 1 | -0/+1 |
| | | | | |\ \ \ | | | | | | |/ / | |||||
| | | | | | * | | Disabled the rpl_killed_ddl test in 5.0 because of bug #45520 | Georgi Kodinov | 2009-11-04 | 1 | -0/+1 |
| | | | | * | | | Automerge. | Davi Arnaut | 2009-11-03 | 1 | -6/+8 |
| | | | | |\ \ \ | | | | | | |/ / | |||||
| | | | | | * | | Fix compiler warnings -- tag unused parameters. | Davi Arnaut | 2009-11-03 | 1 | -6/+8 |
| | | * | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 7 | -2/+532 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | * | | | | A fix and a test case for | Konstantin Osipov | 2009-11-03 | 7 | -6/+538 |
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | |||||
| | | | | * | | | A fix and a test case for | Konstantin Osipov | 2009-11-03 | 8 | -7/+511 |
| | | * | | | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 2 | -4/+0 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge bug#47867 to 5.1-bugteam | Magnus Blåudd | 2009-11-03 | 2 | -4/+0 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Bug#47867 compiler warning _WIN32_WINNT macro redefinition | Magnus Blåudd | 2009-10-06 | 2 | -4/+0 |
| | | | * | | | | | automerge | Kristofer Pettersson | 2009-11-03 | 177 | -1467/+3768 |
| | | | |\ \ \ \ \ | |||||
| | | * | \ \ \ \ \ | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 6 | -15/+15 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | | | |||||
| | | | * | | | | | | Fix automerge: use 'thd->query()' instead of 'thd->query'. | Alexander Nozdrin | 2009-11-05 | 6 | -15/+15 |
| | | * | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 36 | -214/+795 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | | * | | | | | | Manually applied fix for innodb_bug39438 test from 5.1. | Sergey Vojtovich | 2009-11-05 | 1 | -0/+4 |
| | | | * | | | | | | Updates for test cases from innodb-zip-ss6129. | Sergey Vojtovich | 2009-11-05 | 12 | -36/+430 |
| | | | * | | | | | | Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk. | Sergey Vojtovich | 2009-11-05 | 24 | -204/+367 |
| | | | |\ \ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | | | |||||
| | | | | * | | | | | Merge of innodb-zip-ss6129 snapshot. | Sergey Vojtovich | 2009-11-03 | 23 | -205/+368 |
| | | | | |\ \ \ \ \ | |||||
| | | | | | * | | | | | Clean-up after applying innodb-zip-ss6129 snapshot: | Sergey Vojtovich | 2009-11-03 | 2 | -6/+1 |
| | | | | | * | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+1 |
| | | | | | * | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+2 |