Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Bug#53933 crash when using uncacheable subquery in the having clause of outer... | Sergey Glukhov | 2010-06-08 | 3 | -2/+31 |
| * | | | | | | Postfix for bug49741 | 2010-06-08 | 2 | -8/+20 | |
* | | | | | | | merge 5.1-bugteam => trunk-merge | Kristofer Pettersson | 2010-06-08 | 3 | -5/+189 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
| * | | | | | Bug#53191 Lock_time in slow log is negative when logging stored routines | Kristofer Pettersson | 2010-06-08 | 3 | -9/+196 |
| |/ / / / | |||||
* | | | | | merge and typo fix | Georgi Kodinov | 2010-06-07 | 2 | -4/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge | Georgi Kodinov | 2010-06-07 | 1 | -2/+5 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Addendum to the fix for bug #52315: need to set a proper shutdown type | Georgi Kodinov | 2010-06-07 | 1 | -2/+6 |
* | | | | | Manual merge from mysql-trunk-bugfixing. | Alexander Nozdrin | 2010-06-07 | 571 | -24820/+28450 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Post-merge fix: header is used by the client API. Obvious in retrospect. | Davi Arnaut | 2010-06-05 | 5 | -8/+17 |
| * | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-05-31 | 33 | -123/+245 |
| * | | | | merge of patch for bug#52913 from 5.1-bugteam to trunk-bugfixing. Changed $ba... | Horst.Hunger | 2010-06-04 | 3 | -1/+8 |
| * | | | | Automerge. | Alexey Kopytov | 2010-06-03 | 73 | -648/+2203 |
| |\ \ \ \ | |||||
| | * | | | | Patch for trunk after merge from 5.1-bugteam of bug52913. | Horst.Hunger | 2010-06-03 | 8 | -0/+446 |
| | * | | | | Skip perfschema.misc if "var" is a symlink (due to Bug 51447). | Tor Didriksen | 2010-06-03 | 1 | -1/+6 |
| | * | | | | Disable binlog.binlog_spurious_ddl_errors due to Bug 54195. | Alexander Nozdrin | 2010-06-03 | 1 | -3/+3 |
| | * | | | | Auto merge | He Zhenxing | 2010-06-02 | 35 | -376/+897 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge mysql-trunk-bugfixing from bk-internal into my local tree | Vasil Dimov | 2010-06-02 | 13 | -9/+323 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Bug#52520 Difference in tinytext utf column metadata | Alexander Barkov | 2010-06-02 | 13 | -9/+323 |
| | | * | | | | | Merge mysql-trunk-innodb -> mysql-trunk-bugfixing | Vasil Dimov | 2010-06-02 | 20 | -322/+538 |
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | | * | | | | Fix the failing innodb.innodb test: | Vasil Dimov | 2010-06-02 | 1 | -1/+1 |
| | | | * | | | | ut_strerr(): Handle DB_SUCCESS_LOCKED_REC. | Marko Mäkelä | 2010-06-02 | 1 | -0/+2 |
| | | | * | | | | Merge from mysql-5.1-innodb: | Marko Mäkelä | 2010-06-02 | 10 | -211/+308 |
| | | | * | | | | Merge from mysql-5.1-innodb: | Marko Mäkelä | 2010-06-02 | 2 | -43/+0 |
| | | | * | | | | Port bug fix #53592 from mysql-5.1-innodb to mysql-trunk-innodb. | Jimmy Yang | 2010-06-02 | 5 | -43/+206 |
| | | | * | | | | Fix bug #54159 InnoDB: New warnings on Windows. Provide "signed/unsigned" | Jimmy Yang | 2010-06-01 | 1 | -8/+8 |
| | | | * | | | | Merge a change from mysql-5.1-innodb: | Marko Mäkelä | 2010-06-01 | 2 | -16/+13 |