summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* WL#2360 Performance schemaMarc Alff2009-12-0927-376/+637
* WL#2360 Performance schemaMarc Alff2009-12-041-3/+45
* Merge mysql-next-mr (revno 2927) --> mysql-next-mr-marcMarc Alff2009-12-021-9/+32
|\
| * Manual resolving for the following filesAndrei Elkin2009-12-011-9/+32
| |\
| | * merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-302-2/+7
| | |\
| | * | BUG#42150: binlog_start_comment.test failed: Error writing file 'UNOPENED'Luis Soares2009-11-241-9/+32
| | * | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-0611-114/+157
| | |\ \
* | | | | WL#2360 Performance schemaMarc Alff2009-11-302-3/+31
|/ / / /
* | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-2518-113/+60
|\ \ \ \
| * \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-248-16/+1307
| |\ \ \ \
| * | | | | Backport of:Konstantin Osipov2009-11-2417-59/+57
| * | | | | A follow up for the fix for Bug#35164 (remove priorities on Windows).Konstantin Osipov2009-11-231-7/+0
| * | | | | Backport of:Konstantin Osipov2009-11-232-48/+4
* | | | | | WL#2373 Use cycle counter for timingMarc Alff2009-11-244-5/+1052
| |/ / / / |/| | | |
* | | | | Merge mysql-next-mr (revno 2923) --> mysql-next-mr-marcMarc Alff2009-11-202-2/+10
|\ \ \ \ \ | |/ / / /
| * | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-192-2/+10
| |\ \ \ \
| | * | | | Backport of Bug#15192 to mysql-next-mrDavi Arnaut2009-11-101-2/+2
| | * | | | Bug#35224: mysqldump --help is very confusingMagne Mahre2009-11-031-0/+8
* | | | | | Port the unit test framework to windowsMarc Alff2009-11-171-1/+3
* | | | | | WL#3230 concurrent hashMarc Alff2009-11-175-1/+1251
* | | | | | WL#2595 kernel-independent atomic operationsMarc Alff2009-11-172-14/+53
|/ / / / /
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-102-0/+32
|\ \ \ \ \
| * \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-053-18/+41
| |\ \ \ \ \ | | |/ / / /
| * | | | | WL#4903 Plugin Service API part ISergei Golubchik2009-11-021-0/+23
| * | | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-0/+9
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-062-2/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-052-2/+7
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Bug#46586: When using the plugin interface the type "set" for options caused ...Tatiana A. Nurnberg2009-10-272-2/+7
| | * | | | Upmerge a Windows compile fix from 5.0 to 5.1.Joerg Bruehe2009-10-161-1/+1
| | |\ \ \ \
* | | \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-9/+32
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-274-10/+76
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Fix for bug #45143 "All connections hang on concurrent ALTER TABLE".Dmitry Lenev2009-10-261-9/+32
* | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-284-10/+76
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-224-10/+76
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Backport post fix compiler warnings and test failures for BUG#25192 BUG#12190He Zhenxing2009-10-021-2/+2
| | * | | | | Backport BUG#25192 Using relay-log and relay-log-index without values produce...He Zhenxing2009-10-022-10/+68
| | * | | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-232-0/+8
* | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-2314-76/+71
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-213-16/+23
| |\ \ \ \ \ \
| | * | | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-152-11/+18
| | * | | | | | Backporting WL#4164 Two-byte collation IDsAlexander Barkov2009-10-151-5/+5
| * | | | | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-194-47/+6
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-191-0/+4
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Upmerge the Windows compile fix from 5.0 to 5.1Joerg Bruehe2009-10-161-1/+1
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | / | | | | | |_|/ | | | | |/| |
| | | | * | | Compile fix for Windows:Joerg Bruehe2009-10-161-1/+1
| | | * | | | Upmerge (automerge) into 5.1Joerg Bruehe2009-10-091-0/+4
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Fix bug#47923 New "mf_keycache.c" requires thread supportJoerg Bruehe2009-10-081-0/+4
| | | | * | | Bug#47768 pthread_cond_timedwait() is broken on windowsKristofer Pettersson2009-10-061-1/+1
| | | | * | | Merge bug#42850 to 5.0Magnus BlÄudd2009-09-281-3/+4
| | | | |\ \ \
| | * | | \ \ \ Merge from mysql-5.1.Alexander Nozdrin2009-10-193-47/+2
| | |\ \ \ \ \ \ | | | |/ / / / /