Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bug#52208: gis fails on some platforms (Solaris, HP-UX, Linux) | Alexey Kopytov | 2010-06-15 | 2 | -4/+3 |
|\ | |||||
| * | Backport of the patch for bug52208 to 5.1 since the | Alexey Kopytov | 2010-06-15 | 1 | -3/+3 |
* | | null upmerge 53424 | Bjorn Munch | 2010-06-15 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | null upmerge 53424, irrelevant for 5.1 | Bjorn Munch | 2010-06-15 | 0 | -0/+0 |
| |\ | |||||
| | * | Bug #53424 Certain combination of flags give internal error | Bjorn Munch | 2010-06-15 | 1 | -2/+4 |
* | | | Make perfschema.pfs_upgrade and sys_vars.wait_timeout_func experimental. | Alexander Nozdrin | 2010-06-15 | 1 | -1/+3 |
* | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2010-06-15 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | Auto-merge from mysql-trunk-bugfixing. | Alexander Nozdrin | 2010-06-15 | 577 | -24818/+28906 |
| |\ \ \ | |||||
* | \ \ \ | Upmerge and port 46882 | Bjorn Munch | 2010-06-14 | 1 | -1/+2 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Upmerge and port 46882 | Bjorn Munch | 2010-06-14 | 1 | -1/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug #46882 Suite timeout doesn't kill stray processes | Bjorn Munch | 2010-06-14 | 1 | -1/+2 |
* | | | | | Manual merge from mysql-5.1-bugteam. | Alexey Kopytov | 2010-06-12 | 1 | -8/+14 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Addendum for the fix for bug #42064: | Alexey Kopytov | 2010-06-12 | 1 | -7/+12 |
* | | | | | Automerge. | Alexey Kopytov | 2010-06-12 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Automerge. | Alexey Kopytov | 2010-06-11 | 3 | -3/+162 |
| |\ \ \ \ | |||||
* | | | | | | Fixed ha_ndbcluster_binlog.cc to use Parser_state::init(). | Alexey Kopytov | 2010-06-12 | 1 | -2/+3 |
* | | | | | | Automerge. | Ramil Kalimullin | 2010-06-11 | 3 | -3/+162 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Automerge. | Ramil Kalimullin | 2010-06-11 | 3 | -3/+162 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix for bug #54007: assert in ha_myisam::index_next, HANDLER | Ramil Kalimullin | 2010-06-09 | 3 | -3/+162 |
* | | | | | | | Null merge. | Alexey Kopytov | 2010-06-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 16 | -61/+182 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-06-11 | 18 | -47/+179 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 16 | -62/+183 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | |||||
| | * | | | | | Bug #42064: low memory crash when importing hex strings, in | Alexey Kopytov | 2010-05-21 | 16 | -62/+183 |
* | | | | | | | Merge of fix for bug#53859. | Martin Hansson | 2010-06-11 | 3 | -13/+56 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Bug#53859: Valgrind: opt_sum_query(TABLE_LIST*, List<Item>&, | Martin Hansson | 2010-06-11 | 3 | -13/+56 |
* | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 61 | -913/+1018 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 25 | -210/+216 |
| * | | | | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 35 | -1111/+1248 |
* | | | | | | | Auto-merge from mysql-trunk-bugfixing. | Alexander Nozdrin | 2010-06-10 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Revert a patch for Bug#54334 (Double initialization of mysys mutexes). | Alexander Nozdrin | 2010-06-10 | 1 | -0/+2 |
* | | | | | | | Merge fix for Bug#53303 from 5.1-bugteam | Tor Didriksen | 2010-06-10 | 4 | -11/+23 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Backport of Bug#53303 mytap tests should always have a plan() | Tor Didriksen | 2010-06-10 | 4 | -14/+26 |
* | | | | | | | Auto-merge from mysql-trunk-bugfixing. | Alexander Nozdrin | 2010-06-10 | 2 | -3/+1 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Bug#54334 Double initialization of mysys mutexes | Marc Alff | 2010-06-08 | 1 | -2/+0 |
* | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-09 | 1 | -1/+9 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2010-06-09 | 1 | -1/+9 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | | | |||||
| | * | | | | Bug#34236: Various possibly related SSL crashes | Davi Arnaut | 2010-06-09 | 1 | -1/+9 |
* | | | | | | merge | Georgi Kodinov | 2010-06-09 | 4 | -1/+38 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge | Georgi Kodinov | 2010-06-09 | 4 | -1/+38 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bug #52512: Assertion `! is_set()' in Diagnostics_area::set_ok_status | Georgi Kodinov | 2010-04-07 | 4 | -1/+38 |
* | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-08 | 16 | -63/+73 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2010-06-08 | 17 | -63/+75 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Bug#53906: Stray semicolon in my_sys.h corrupts macro function definition of ... | Davi Arnaut | 2010-06-08 | 1 | -1/+1 |
| | * | | | | | Bug#34236: Various possibly related SSL crashes | Davi Arnaut | 2010-06-08 | 16 | -61/+70 |
| * | | | | | | automerge | Kristofer Pettersson | 2010-06-08 | 3 | -2/+31 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Automerge | Kristofer Pettersson | 2010-06-08 | 6 | -11/+51 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Addendum to merge of Bug#52315 to mysql-trunk-merge : | Georgi Kodinov | 2010-06-08 | 1 | -1/+0 |
| * | | | | | | | | 5.1-bugteam->trunk-merge merge | Sergey Glukhov | 2010-06-08 | 3 | -2/+31 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2010-06-08 | 3 | -2/+31 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | |