summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bug#52208: gis fails on some platforms (Solaris, HP-UX, Linux)Alexey Kopytov2010-06-152-4/+3
|\
| * Backport of the patch for bug52208 to 5.1 since theAlexey Kopytov2010-06-151-3/+3
* | null upmerge 53424Bjorn Munch2010-06-150-0/+0
|\ \ | |/
| * null upmerge 53424, irrelevant for 5.1Bjorn Munch2010-06-150-0/+0
| |\
| | * Bug #53424 Certain combination of flags give internal errorBjorn Munch2010-06-151-2/+4
* | | Make perfschema.pfs_upgrade and sys_vars.wait_timeout_func experimental.Alexander Nozdrin2010-06-151-1/+3
* | | Auto-merge from mysql-trunk.Alexander Nozdrin2010-06-150-0/+0
|\ \ \
| * \ \ Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-15577-24818/+28906
| |\ \ \
* | \ \ \ Upmerge and port 46882Bjorn Munch2010-06-141-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Upmerge and port 46882Bjorn Munch2010-06-141-1/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug #46882 Suite timeout doesn't kill stray processesBjorn Munch2010-06-141-1/+2
* | | | | Manual merge from mysql-5.1-bugteam.Alexey Kopytov2010-06-121-8/+14
|\ \ \ \ \ | |/ / / /
| * | | | Addendum for the fix for bug #42064:Alexey Kopytov2010-06-121-7/+12
* | | | | Automerge.Alexey Kopytov2010-06-120-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Automerge.Alexey Kopytov2010-06-113-3/+162
| |\ \ \ \
* | | | | | Fixed ha_ndbcluster_binlog.cc to use Parser_state::init().Alexey Kopytov2010-06-121-2/+3
* | | | | | Automerge.Ramil Kalimullin2010-06-113-3/+162
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Automerge.Ramil Kalimullin2010-06-113-3/+162
| |\ \ \ \ \
| | * | | | | Fix for bug #54007: assert in ha_myisam::index_next, HANDLERRamil Kalimullin2010-06-093-3/+162
* | | | | | | Null merge.Alexey Kopytov2010-06-110-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Manual merge from the bugfix tree.Alexey Kopytov2010-06-1116-61/+182
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-06-1118-47/+179
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Manual merge from the bugfix tree.Alexey Kopytov2010-06-1116-62/+183
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | Bug #42064: low memory crash when importing hex strings, inAlexey Kopytov2010-05-2116-62/+183
* | | | | | | Merge of fix for bug#53859.Martin Hansson2010-06-113-13/+56
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Bug#53859: Valgrind: opt_sum_query(TABLE_LIST*, List<Item>&,Martin Hansson2010-06-113-13/+56
* | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-1061-913/+1018
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-1025-210/+216
| * | | | | | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-1035-1111/+1248
* | | | | | | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-101-0/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Revert a patch for Bug#54334 (Double initialization of mysys mutexes).Alexander Nozdrin2010-06-101-0/+2
* | | | | | | Merge fix for Bug#53303 from 5.1-bugteamTor Didriksen2010-06-104-11/+23
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Backport of Bug#53303 mytap tests should always have a plan()Tor Didriksen2010-06-104-14/+26
* | | | | | | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-102-3/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Bug#54334 Double initialization of mysys mutexesMarc Alff2010-06-081-2/+0
* | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-091-1/+9
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-091-1/+9
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Bug#34236: Various possibly related SSL crashesDavi Arnaut2010-06-091-1/+9
* | | | | | mergeGeorgi Kodinov2010-06-094-1/+38
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MergeGeorgi Kodinov2010-06-094-1/+38
| |\ \ \ \ \
| | * | | | | Bug #52512: Assertion `! is_set()' in Diagnostics_area::set_ok_status Georgi Kodinov2010-04-074-1/+38
* | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-0816-63/+73
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-0817-63/+75
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Bug#53906: Stray semicolon in my_sys.h corrupts macro function definition of ...Davi Arnaut2010-06-081-1/+1
| | * | | | | Bug#34236: Various possibly related SSL crashesDavi Arnaut2010-06-0816-61/+70
| * | | | | | automergeKristofer Pettersson2010-06-083-2/+31
| |\ \ \ \ \ \
* | \ \ \ \ \ \ AutomergeKristofer Pettersson2010-06-086-11/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Addendum to merge of Bug#52315 to mysql-trunk-merge : Georgi Kodinov2010-06-081-1/+0
| * | | | | | | | 5.1-bugteam->trunk-merge mergeSergey Glukhov2010-06-083-2/+31
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2010-06-083-2/+31
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |