summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-164-24/+14
|\
| * Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-10/+0
| |\
| | * Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-10/+0
| * | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-123-14/+14
| |\ \ | | |/
| | * Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1141-563/+1560
| | |\
| | * \ Automerge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-011-2/+2
| | |\ \
| | | * | Move DBG_* macros to after the variable declaration section in aKent Boortz2009-11-251-2/+2
| | * | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-1/+1
| | |\ \ \ | | | |/ /
| | | * | Additional fix for bug #45613: handle failures from my_hash_insertGeorgi Kodinov2009-11-231-1/+0
| | | * | mergeKristofer Pettersson2009-11-201-0/+1
| | | |\ \
| | | | * | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-0/+1
| | | * | | mergeGeorgi Kodinov2009-11-201-1/+1
| | | |\ \ \
| | | | * | | Use C comments in C codetimothy.smith@sun.com2009-11-051-1/+1
| | * | | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-11/+11
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Bug#46043 mysqld --skip-innodb does not skip InnoDBKristofer Pettersson2009-11-091-11/+11
| | | |/ / /
* | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-112-5/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-101-3/+45
| |\ \ \ \ \
| * | | | | | Bug#47756 Setting 2byte collation ID with 'set names' crashes the serverAlexander Barkov2009-12-071-0/+3
| * | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-042-3/+31
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-9/+32
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Auto-merge (pull) from mysql-next-mr.Alexander Nozdrin2009-11-264-5/+1052
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-2518-113/+60
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-238-16/+1307
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-202-2/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ merging.Alexey Botchkov2009-11-171-5/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Bug#47216 programs should quit if the file specified by --defaults-file ...Alexey Botchkov2009-10-091-5/+9
* | | | | | | | | | | | | 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