summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-2435-404/+2551
|\
| * Auto-merge from mysql-next-mr-marc (WL#2595).Alexander Nozdrin2009-11-2335-404/+2551
| |\
| | * Merge mysql-next-mr (revno 2923) --> mysql-next-mr-marcMarc Alff2009-11-2084-703/+2377
| | |\ | | |/ | |/|
| | * Port the unit test framework to windowsMarc Alff2009-11-1712-22/+163
| | * WL#3230 concurrent hashMarc Alff2009-11-1711-4/+1713
| | * Misc cleanupMarc Alff2009-11-172-97/+1
| | * WL#2595 kernel-independent atomic operationsMarc Alff2009-11-1714-282/+675
| | * Merge mysql-next-mr (revno 2922) --> mysql-next-mr-marcMarc Alff2009-11-16215-1561/+4902
| | |\
| | * | New tree for mergesMarc Alff2009-11-161-1/+1
* | | | Backport of:Konstantin Osipov2009-11-241-7/+29
* | | | (no commit message)Konstantin Osipov2009-11-241-198/+193
|\ \ \ \
| * | | | Remove handle_delayed_insert_impl().Alexander Nozdrin2009-11-241-198/+193
* | | | | Backport of:Konstantin Osipov2009-11-24117-845/+835
|/ / / /
* | | | A follow up for the fix for Bug#35164 (remove priorities on Windows).Konstantin Osipov2009-11-231-7/+0
* | | | Backport of:Konstantin Osipov2009-11-2316-172/+20
* | | | Backport of:Konstantin Osipov2009-11-238-36/+11
* | | | Backport of:Konstantin Osipov2009-11-231-8/+7
* | | | Backport of:Konstantin Osipov2009-11-211-2/+13
* | | | Backport the implementation of vio_pending from 6.0-codebase.Konstantin Osipov2009-11-212-0/+25
* | | | Backport the test case for Bug#31881 "A statement is not aborted immediately ...Konstantin Osipov2009-11-212-0/+70
* | | | Backport of:Konstantin Osipov2009-11-211-1/+44
* | | | Backport the test caes for Bug#36510 from 6.0-codebase.Konstantin Osipov2009-11-212-0/+60
* | | | Backport of:Konstantin Osipov2009-11-203-2/+24
* | | | Backport of:Konstantin Osipov2009-11-203-10/+51
* | | | Backport of:Konstantin Osipov2009-11-2017-2/+104
* | | | Backport of:Konstantin Osipov2009-11-204-71/+77
* | | | Enable test cases for Bug#6063 and Bug#7088.Magne Mahre2009-11-202-7/+48
|/ / /
* | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-1984-703/+2377
|\ \ \ | |_|/ |/| |
| * | Post-merge fixes for backports.Davi Arnaut2009-11-133-4/+6
| * | Bug#40700: aclocal warnings for missing cache-id'sMagne Mahre2009-11-111-3/+3
| * | Bug #33544 UDF_INIT member decimals initialized wrong with Magne Mahre2009-11-118-16/+3
| |\ \
| | * | Bug #33544: UDF_INIT member decimals initialized wrong with unknown2008-03-058-16/+3
| * | | Bug #37097 mysqltest add result file format version 2Magne Mahre2009-11-111-7/+120
| * | | Fix of incorrect casting for large sizesMagne Mahre2009-11-111-8/+7
| * | | Return type fix (strlen returns size_t)Magne Mahre2009-11-111-1/+1
| * | | Bug #5724 'mysqladmin password' should be allowed to prompt for passwordMagne Mahre2009-11-111-9/+30
| * | | Bug #14637: trim trailing spaces processes data only byte wiseMagne Mahre2009-11-115-17/+78
| * | | The FIONREAD macro could expand to a expression whichDavi Arnaut2009-11-101-1/+2
| * | | Backport of Bug#45767 to mysql-next-mrDavi Arnaut2009-11-104-455/+0
| * | | Backport of Bug#27249 to mysql-next-mrDavi Arnaut2009-11-103-7/+277
| * | | Backport of Bug#15192 to mysql-next-mrDavi Arnaut2009-11-1020-70/+80
| * | | Backport of Bug#41860 to mysql-next-mrDavi Arnaut2009-11-1010-47/+223
| * | | Backport of Bug#10374 to mysql-next-mrDavi Arnaut2009-11-107-15/+164
| * | | Backport of Bug#27525 to mysql-next-mrDavi Arnaut2009-11-109-28/+378
| * | | Backport of Bug#37843 to mysql-next-mrDavi Arnaut2009-11-101-5/+5
| * | | Backport of Bug#36785 to mysql-next-mrDavi Arnaut2009-11-102-3/+9
| * | | Backport of Bug#32140 to mysql-next-mrDavi Arnaut2009-11-101-0/+3
| * | | Backport of Bug#36649 to mysql-next-mrDavi Arnaut2009-11-106-2/+319
| * | | automergeKristofer Pettersson2009-11-103-31/+29
| |\ \ \
| | * | | Backport of Bug#47304 to mysql-next-mrDavi Arnaut2009-11-102-2/+1