summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Bug#53933 crash when using uncacheable subquery in the having clause of outer...Sergey Glukhov2010-06-083-2/+31
| * | | | | | Postfix for bug497412010-06-082-8/+20
* | | | | | | merge 5.1-bugteam => trunk-mergeKristofer Pettersson2010-06-083-5/+189
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Bug#53191 Lock_time in slow log is negative when logging stored routinesKristofer Pettersson2010-06-083-9/+196
| |/ / / /
* | | | | merge and typo fixGeorgi Kodinov2010-06-072-4/+7
|\ \ \ \ \ | |/ / / /
| * | | | mergeGeorgi Kodinov2010-06-071-2/+5
| |\ \ \ \ | | |/ / /
| | * | | Addendum to the fix for bug #52315: need to set a proper shutdown typeGeorgi Kodinov2010-06-071-2/+6
* | | | | Manual merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-07571-24820/+28450
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Post-merge fix: header is used by the client API. Obvious in retrospect.Davi Arnaut2010-06-055-8/+17
| * | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-05-3133-123/+245
| * | | | merge of patch for bug#52913 from 5.1-bugteam to trunk-bugfixing. Changed $ba...Horst.Hunger2010-06-043-1/+8
| * | | | Automerge.Alexey Kopytov2010-06-0373-648/+2203
| |\ \ \ \
| | * | | | Patch for trunk after merge from 5.1-bugteam of bug52913.Horst.Hunger2010-06-038-0/+446
| | * | | | Skip perfschema.misc if "var" is a symlink (due to Bug 51447).Tor Didriksen2010-06-031-1/+6
| | * | | | Disable binlog.binlog_spurious_ddl_errors due to Bug 54195.Alexander Nozdrin2010-06-031-3/+3
| | * | | | Auto mergeHe Zhenxing2010-06-0235-376/+897
| | |\ \ \ \
| | | * \ \ \ Merge mysql-trunk-bugfixing from bk-internal into my local treeVasil Dimov2010-06-0213-9/+323
| | | |\ \ \ \
| | | | * | | | Bug#52520 Difference in tinytext utf column metadataAlexander Barkov2010-06-0213-9/+323
| | | * | | | | Merge mysql-trunk-innodb -> mysql-trunk-bugfixingVasil Dimov2010-06-0220-322/+538
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Fix the failing innodb.innodb test:Vasil Dimov2010-06-021-1/+1
| | | | * | | | ut_strerr(): Handle DB_SUCCESS_LOCKED_REC.Marko Mäkelä2010-06-021-0/+2
| | | | * | | | Merge from mysql-5.1-innodb:Marko Mäkelä2010-06-0210-211/+308
| | | | * | | | Merge from mysql-5.1-innodb:Marko Mäkelä2010-06-022-43/+0
| | | | * | | | Port bug fix #53592 from mysql-5.1-innodb to mysql-trunk-innodb.Jimmy Yang2010-06-025-43/+206
| | | | * | | | Fix bug #54159 InnoDB: New warnings on Windows. Provide "signed/unsigned"Jimmy Yang2010-06-011-8/+8
| | | | * | | | Merge a change from mysql-5.1-innodb:Marko Mäkelä2010-06-012-16/+13