summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-201-3/+3
|\
| * Plugin author, description and version are availableSergey Vojtovich2010-03-161-3/+3
* | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-03-071-1/+1
|\ \ | |/
| * Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2010-02-261-1/+1
* | Auto-merge from mysql-trunk.Alexander Nozdrin2010-02-053-8/+5
|\ \
| * \ Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-1/+1
| |\ \ | | |/
| | * Merging from 5.0-bugteamStaale Smedseng2010-01-271-1/+1
| | |\
| * | \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-251-6/+3
| |\ \ \ | | |/ /
| | * | mergeGeorgi Kodinov2009-12-241-6/+3
| | |\ \ | | | |/
| | | * Bug #48866: mysql.test fails under Fedora 12Georgi Kodinov2009-12-161-6/+3
| * | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-231-1/+1
| |\ \ \ | | |/ /
| | * | Bug#43397 mysql headers redefine pthread_mutex_init Staale Smedseng2009-12-201-1/+1
* | | | Auto merge from 5.1-rep-semisyncHe Zhenxing2010-02-041-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Bug#49894 shifted MYSQL_REPLICATION_PLUGIN numberHe Zhenxing2010-02-041-2/+3
* | | | Automerge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2009-12-172-1/+4
|\ \ \ \ | | |/ / | |/| |
| * | | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-172-1/+4
| |\ \ \ | | | |/ | | |/|
| | * | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap()Satya B2009-12-172-0/+7
* | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-163-1/+18
|\ \ \ \ | |/ / /
| * | | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2009-12-123-1/+18
* | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-4/+0
|\ \ \ \
| * | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-4/+0
* | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge from 5.0Staale Smedseng2009-12-061-1/+1
| |\ \ \ | | |/ /
* | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1144-488/+697
|\ \ \ \
| * \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-1012-264/+409
| |\ \ \ \
| | * \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-057-238/+50
| | |\ \ \ \
| | * | | | | unit tests for my_vsnprintf,Sergei Golubchik2009-11-041-1/+1
| | * | | | | WL#4903 Plugin Service API part ISergei Golubchik2009-11-029-155/+326
| | * | | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-303-109/+83
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-064-2/+30
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-0/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-281-0/+2
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-2727-4/+208
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-226-15/+25
| | |\ \ \ \ \ \ \
| | * | | | | | | | Backport WL#4098 from 6.0.Alexander Nozdrin2009-10-211-0/+1
| * | | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-2828-4/+210
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-2727-4/+208
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-2227-4/+208
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | Manual merge semi-sync to 5.1-rep+2He Zhenxing2009-10-032-1/+88
| | | | |\ \ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | |
| | | | | * | | | | Backporting WL#4398 WL#1720He Zhenxing2009-09-262-1/+88
| | | | * | | | | | Backport BUG#25192 Using relay-log and relay-log-index without values produce...He Zhenxing2009-10-021-0/+1
| | | | * | | | | | WL#4828 and BUG#45747Alfranio Correia2009-09-291-0/+19
| | | | * | | | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-2323-3/+100
| | | | |/ / / / /
| | * | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-233-10/+13
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | * | | | | | | WL#1349 Use operating system localization to send it as a default client char...Alexander Barkov2009-10-211-0/+2
| * | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-236-15/+25
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-215-5/+12
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | A postfix for WL#751Alexander Barkov2009-10-161-0/+1
| | | * | | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-152-1/+6
| | | * | | | | | Backporting WL#4164 Two-byte collation IDsAlexander Barkov2009-10-153-4/+5
| | | | |/ / / / | | | |/| | | |