summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Fix for bug #48538 "Assertion in thr_lock() on LOAD DATA CONCURRENTJon Olav Hauglid2010-01-081-9/+20
* Merge next-mr -> next-4284.Konstantin Osipov2009-12-161-0/+3
|\
| * 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
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-5/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
* | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-153-6/+76
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-041-3/+45
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge mysql-next-mr (revno 2927) --> mysql-next-mr-marcMarc Alff2009-12-021-9/+32
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | WL#2360 Performance schemaMarc Alff2009-11-302-3/+31
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Backport of revno: 2617.68.18Jon Olav Hauglid2009-12-091-7/+25
* | | | | | | | Backport of:Konstantin Osipov2009-12-031-0/+7
* | | | | | | | Backport of:Konstantin Osipov2009-12-031-0/+13
* | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2009-12-035-14/+1084
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-2518-113/+60
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | WL#2373 Use cycle counter for timingMarc Alff2009-11-244-5/+1052
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Backport of:Konstantin Osipov2009-12-031-0/+2
* | | | | | | | | Backport of:Konstantin Osipov2009-12-021-6/+36
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-248-16/+1307
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge mysql-next-mr (revno 2923) --> mysql-next-mr-marcMarc Alff2009-11-202-2/+10
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | 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
| | |_|_|_|/ / | |/| | | | |
* | | | | | | 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
| |/ / / / / |/| | | | |
* | | | | | 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
* | | | | | 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
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
View Lorry Controller Status