summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-191-1/+0
| |\ \
| | * \ Merge from mysql-5.1.Alexander Nozdrin2009-10-191-1/+0
| | |\ \
| | | * | Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clashMagnus BlÄudd2009-10-061-1/+0
| * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-143-9/+13
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Merge from mysql-5.1.Alexander Nozdrin2009-10-133-9/+13
| | |\ \ | | | |/
| | | * WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+10
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-231-3/+3
| | | * Merge from 5.0Staale Smedseng2009-09-171-6/+0
| | | |\
| | | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-171-6/+0
| | | | * Bug#17332 - changing key_buffer_size on a running serverIngo Struewing2009-09-071-0/+6
* | | | | Merge with next-mr-runtime.Konstantin Osipov2009-10-221-1/+11
|\ \ \ \ \
| * \ \ \ \ Pull from mysql-next-mr-runtime.Alexander Nozdrin2009-10-163-185/+12
| |\ \ \ \ \
| * | | | | | Backporting revision from 6.0:Alexander Nozdrin2009-10-161-1/+11
* | | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-223-2/+11
| |/ / / / / |/| | | | |
* | | | | | Backport of:Konstantin Osipov2009-10-161-4/+0
* | | | | | Backport of:Konstantin Osipov2009-10-162-146/+12
* | | | | | Backport of:Konstantin Osipov2009-10-161-35/+0
|/ / / / /
* | | | | Backport of:Konstantin Osipov2009-10-141-34/+0
* | | | | Introduce thd->query_cache_tls (threadKonstantin Osipov2009-10-132-4/+3
* | | | | Bug #44651 "have_community_features" variable should be renamed Jon Olav Hauglid2009-10-091-1/+0
* | | | | Bug #33831 mysql_real_connect() connects again if Magne Mahre2009-10-091-1/+2
* | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-091-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-084-36/+16
| |\ \ \ \
| * | | | | Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":Guilhem Bichot2009-09-301-3/+5
* | | | | | Backport to 5.4 the following changesets:Konstantin Osipov2009-10-092-10/+10
| |/ / / / |/| | | |
* | | | | Merge from mysq-next-mr-wtf.Alexander Nozdrin2009-10-023-36/+14
|\ \ \ \ \
| * | | | | backport of Vladislav Vaintroub2009-09-302-8/+3
| * | | | | Backport of this changeset Vladislav Vaintroub2009-09-302-7/+8
| * | | | | Windows improvements : manual backport of Vladislav Vaintroub2009-09-301-21/+3
| |/ / / /
* | | | | Backporting WL#3759 Optimize identifier conversion in client-server protocolAlexander Barkov2009-09-301-0/+2
|/ / / /
* | | | merge mysql-next-mr-alikVladislav Vaintroub2009-09-241-11/+20
|\ \ \ \
| * \ \ \ Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-173-4/+68
| |\ \ \ \ | | |/ / /
| * | | | WL#2110 (SIGNAL)Marc Alff2009-09-101-11/+20
* | | | | mergeVladislav Vaintroub2009-09-233-4/+68
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-163-4/+68
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Add DBUG_VIOLATION_HELPER_LEAVE definition to non-debug build.Alexander Nozdrin2009-09-101-0/+1
| | * | A patch for Bug#45118 (mysqld.exe crashed in debug modeAlexander Nozdrin2009-09-101-4/+47
| | * | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-09-031-0/+1
| | |\ \ | | | |/
| | | * Fix for BUG#46591 - .frm file isn't sync'd with sync_frm enabled for Satya B2009-09-031-0/+1
| | * | Merge from 5.0 for 43414Staale Smedseng2009-08-281-0/+19
| | |\ \ | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-0/+13
* | | | This is the downport ofVladislav Vaintroub2009-09-114-12/+60
|/ / /
* | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-125-13/+16
|\ \ \ | |/ /
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-114-10/+33
| |\ \
| * \ \ Auto-mergeIgnacio Galarza2009-07-312-2/+4
| |\ \ \ | | | |/ | | |/|