Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | AUtomatic merge, no conflicts, no modifications of files | Matthias Leich | 2009-03-30 | 0 | -0/+0 | |
|\ | ||||||
| * | merge of fix for bug 43383 into actual tree | Matthias Leich | 2009-03-30 | 4 | -30/+61 | |
| |\ | ||||||
| * \ | Merge from 5.0-bugteam | Staale Smedseng | 2009-03-27 | 5 | -14/+54 | |
| |\ \ | ||||||
* | \ \ | Merge of fix for bug 43383 into actual tree | Matthias Leich | 2009-03-30 | 3 | -27/+65 | |
|\ \ \ \ | ||||||
| | \ \ \ | ||||||
| | \ \ \ | ||||||
| *-. \ \ \ | Merge 5.0 -> 5.1 of fix for bug 43383 | Matthias Leich | 2009-03-30 | 3 | -27/+65 | |
| |\ \ \ \ \ | | | | |_|/ | | | |/| | | ||||||
| | | * | | | Fix for Bug#43383 main.variables-big : Weak testing code and result | Matthias Leich | 2009-03-26 | 4 | -30/+61 | |
| | * | | | | Fix for Bug#43383 main.variables-big : Weak testing code and result | Matthias Leich | 2009-03-25 | 4 | -30/+61 | |
| | |/ / / | ||||||
* | | | | | Automerge | Kristofer Pettersson | 2009-03-30 | 3 | -10/+324 | |
|\ \ \ \ \ | ||||||
| * | | | | | Bug#40127 Multiple table DELETE IGNORE hangs on foreign key constraint violation | Kristofer Pettersson | 2009-03-27 | 3 | -10/+324 | |
* | | | | | | Merge from 5.1-bugteam | Staale Smedseng | 2009-03-27 | 5 | -14/+54 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Automerge. | Alexey Kopytov | 2009-03-27 | 0 | -0/+0 | |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
| | * | | | | | Automerge. | Alexey Kopytov | 2009-03-27 | 5 | -14/+54 | |
| | |\ \ \ \ \ | ||||||
| * | \ \ \ \ \ | Automerge. | Alexey Kopytov | 2009-03-27 | 5 | -14/+54 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Manual merge. | Alexey Kopytov | 2009-03-27 | 5 | -14/+54 | |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | ||||||
| | | * | | | | | | Fix for bug #43432: Union on floats does unnecessary rounding | Alexey Kopytov | 2009-03-27 | 5 | -14/+54 | |
* | | | | | | | | | Merge from 5.0-bugteam | Staale Smedseng | 2009-03-27 | 3 | -26/+87 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | Bug#39953 Triggers are not working properly with multi table | Staale Smedseng | 2009-03-27 | 3 | -26/+91 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge | Ramil Kalimullin | 2009-03-27 | 3 | -3/+83 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Fix for bug #26288: savepoint not deleted, comit on empty transaction | Ramil Kalimullin | 2009-03-27 | 3 | -3/+66 | |
* | | | | | | | Merge | Leonard Zhou | 2009-03-27 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge | Leonard Zhou | 2009-03-27 | 196 | -2239/+3586 | |
| |\ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ | Merge 5.0 to 5.1 | Leonard Zhou | 2009-03-27 | 5 | -1/+87 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | BUG#35515 Aliases of variables in binary log are ignored with NAME_CONST. | Leonard Zhou | 2009-03-26 | 5 | -1/+87 | |
* | | | | | | | | Bug#33899: Deadlock in mysql_real_query with shared memory connections | Davi Arnaut | 2009-03-26 | 3 | -7/+41 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Bug#33899: Deadlock in mysql_real_query with shared memory connections | Davi Arnaut | 2009-03-26 | 3 | -7/+39 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge | Leonard Zhou | 2009-03-26 | 90 | -664/+1131 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | auto-merge | Ignacio Galarza | 2009-03-25 | 1 | -3/+0 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Correct failing archive test. | Ignacio Galarza | 2009-03-25 | 1 | -3/+0 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Disable query_cache_28249 due to Bug#43861. | Alexander Nozdrin | 2009-03-25 | 1 | -0/+2 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | Automerge | Alexey Kopytov | 2009-03-25 | 1 | -5/+8 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Automerge. | Alexey Kopytov | 2009-03-25 | 2 | -2/+33 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge wide-char curses test and bugteam trunk. | Chad MILLER | 2009-03-25 | 143 | -1269/+2071 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Accept wide-character version of libncurses also. | Chad MILLER | 2009-03-11 | 1 | -5/+8 | |
| * | | | | | | | | Automerge | Alexey Kopytov | 2009-03-25 | 2 | -3/+34 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Manual merge. | Alexey Kopytov | 2009-03-25 | 2 | -3/+34 | |
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | ||||||
| | | * | | | | | | | Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can | Alexey Kopytov | 2009-03-24 | 2 | -2/+33 | |
| * | | | | | | | | | merge to latest 5.1-bugteam | Satya B | 2009-03-25 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge | Leonard Zhou | 2009-03-25 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Empty merge for fixing only in 5.0 | Leonard Zhou | 2009-03-25 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ \ | merge 5.0-bugteam to 5.1-bugteam | Satya B | 2009-03-25 | 3 | -0/+57 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | / / / / / | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | merge to 5.0-bugteam | Satya B | 2009-03-25 | 14 | -49/+549 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | Fix the test case error in PB. | Leonard Zhou | 2009-03-25 | 2 | -0/+2 | |
| | * | | | | | | | | | | Fix for BUG#41541 - Valgrind warnings on packed MyISAM table | Satya B | 2009-03-25 | 3 | -0/+56 | |
| * | | | | | | | | | | | Disabled embedded server in the test case for bug #41486. | Alexey Kopytov | 2009-03-25 | 1 | -0/+2 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Fix for bug #43801: mysql.test takes too long, fails due to | Alexey Kopytov | 2009-03-25 | 2 | -0/+6 | |
| * | | | | | | | | | | Fix test case erro in sles10-ia64-a. | Leonard Zhou | 2009-03-25 | 2 | -0/+2 | |
| * | | | | | | | | | | Automerge. | Alexey Kopytov | 2009-03-24 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Automerge. | Alexey Kopytov | 2009-03-24 | 5 | -42/+76 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ | Automerge. | Alexey Kopytov | 2009-03-24 | 4 | -42/+55 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Manuel merge. | Alexey Kopytov | 2009-03-24 | 4 | -42/+55 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | |