summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge 5.1-build up into 5.4-build ("trunk-build").Joerg Bruehe2009-09-287-15/+36
|\
| * Upmerge 5.0-build -> 5.1-build.Joerg Bruehe2009-09-282-2/+3
| |\
| | * Merge the fix for bug#47137 into 5.0-buildJoerg Bruehe2009-09-281-1/+2
| | |\
| | | * Fix bug#47137Joerg Bruehe2009-09-171-1/+2
| | * | Merge from mysql-5.0.86-releaseunknown2009-09-211-1/+1
| | |\ \
| | | * | change c++ comment to c commentmysql-5.0.86hery2009-09-091-1/+1
| | | |/
| * | | Merge main 5.1 into 5.1-build (a fix from 5.1.39).Joerg Bruehe2009-09-281-0/+1
| |\ \ \
| * | | | Fix bug#46980Joerg Bruehe2009-09-176-13/+33
| * | | | Null-merge a version number change from 5.0 to 5.1Joerg Bruehe2009-09-150-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Raise version number after cloning 5.0.86unknown2009-09-081-2/+2
| | | |/ | | |/|
* | | | Update default.confAlexander Nozdrin2009-09-251-1/+1
* | | | Mark rpl.rpl_innodb_bug30888 experimental.Alexander Nozdrin2009-09-251-0/+1
* | | | Mark rpl.rpl_trigger experimental.Alexander Nozdrin2009-09-251-0/+1
* | | | Disable ndb and rpl_ndb test suites from regular tests.Alexander Nozdrin2009-09-241-0/+5
* | | | Mark some tests experimental.Alexander Nozdrin2009-09-242-5/+55
* | | | Update disabled.def files.Alexander Nozdrin2009-09-234-4/+4
* | | | Update default.conf.Alexander Nozdrin2009-09-231-1/+1
* | | | Update default.conf.Alexander Nozdrin2009-09-231-1/+1
* | | | Merge from mysql-trunk.Alexander Nozdrin2009-09-234-12/+13
|\ \ \ \
| * | | | Update version in configure.in.Alexander Nozdrin2009-09-231-1/+1
| * | | | Merge from mysql-5.1.Alexander Nozdrin2009-09-231-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge from mysql-5.1.39-releaseJonathan Perkin2009-09-211-0/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Install mysqld.libmysql-5.1.39Jonathan Perkin2009-09-041-0/+1
| * | | | merge from 5.1 of merge from 5.1-mtrBjorn Munch2009-09-222-11/+11
| |\ \ \ \ | | |/ / /
| | * | | merge from 5.1-mtrBjorn Munch2009-09-0353-126/+341
| | |\ \ \
| | | * \ \ 3rd merge from mainBjorn Munch2009-09-039-20/+58
| | | |\ \ \ | | | | |/ /
| | | * | | mergeBjorn Munch2009-09-031-2/+2
| | | |\ \ \
| | | * | | | A few suppression follow-upsBjorn Munch2009-09-034-0/+8
| | | * | | | second merge from main, with adaptionsBjorn Munch2009-09-02145-1071/+6275
| | | |\ \ \ \
| | | * \ \ \ \ first merge from mainBjorn Munch2009-09-02913-4531/+259638
| | | |\ \ \ \ \
* | | | \ \ \ \ \ Merge from mysql-trunk.Alexander Nozdrin2009-09-2263-136/+414
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Update version.Alexander Nozdrin2009-09-221-1/+1
| * | | | | | | | merge from trunk-mtrBjorn Munch2009-09-2255-126/+358
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ new merge from trunkBjorn Munch2009-09-2113-77/+167
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Update default.experimental.Alexander Nozdrin2009-09-201-2/+2
| * | | | | | | | | Merge from mysql-trunk.Alexander Nozdrin2009-09-191-0/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Mark some tests experimental.Alexander Nozdrin2009-09-191-0/+11
| * | | | | | | | | | Merge from mysql-5.1.Alexander Nozdrin2009-09-197-11/+46
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Raise version number after cloning 5.1.39Jonathan Perkin2009-09-031-1/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Merge from mysql-5.1.38-releaseclone-5.1.39-buildJonathan Perkin2009-09-039-20/+58
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Only install the innodb plugin if the plugin directory exists.mysql-5.1.38Jonathan Perkin2009-09-011-8/+14
| | | * | | | | | Disable ftexample to match other packages, ride previous changelog entry.Jonathan Perkin2009-08-251-3/+2
| | | * | | | | | Tidy previous, put example storage engine back as it's used by tests.Jonathan Perkin2009-08-241-5/+15
| | | * | | | | | Add conditionals for bundled zlib and innodb pluginJonathan Perkin2009-08-241-0/+24
| | | * | | | | | Apply patch from bug#46834 to install the test suite in RPMs.Jonathan Perkin2009-08-214-4/+11
| | | * | | | | | Add plugins to RPMs. Disable example plugins.Jonathan Perkin2009-08-211-0/+11
| | | * | | | | | Install innodb_plugin on Windows.Jonathan Perkin2009-08-181-0/+11
| | | * | | | | | Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.Jonathan Perkin2009-08-144-11/+20
| | | * | | | | | Apply build fixJonathan Perkin2009-08-123-2/+3
| | | | * | | | | tiny suppression fix: avoid /Bjorn Munch2009-09-211-1/+1
View Lorry Controller Status