summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* fix for a possible DoS in the my_net_skip_rest()Sergei Golubchik2010-02-232-2/+2
* When one does a drop table, the indexes are not flushed to disk before drop a...Michael Widenius2010-02-101-1/+1
* Changed version number from RC to stableMichael Widenius2010-01-291-2/+2
|\
* | Fixed some compiler warnings and errors in test suite found by buildbotMichael Widenius2010-01-272-2/+3
* | Merge with MySQL 5.1.42Michael Widenius2010-01-153-22/+2
|\ \ | |/
| * Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an...Davi Arnaut2009-11-242-20/+0
| * Bug#47571 : idle named pipe connection is unkillableVladislav Vaintroub2009-11-201-2/+2
* | Fix for compiler warnings on windowsMichael Widenius2010-01-141-3/+3
* | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-307-34/+125
|\ \
| * | Added more general support for sorting 2 characters as one (contractions)Michael Widenius2009-11-301-1/+26
| * | MySQL 5.1.41 after-merge fix: Fix non-debug build breakage.unknown2009-11-161-0/+1
| * | Merge with MySQL 5.1, with following additions:unknown2009-11-166-33/+98
| |\ \ | | |/
| | * mergeVladislav Vaintroub2009-11-033-0/+24
| | |\
| | | * Automerge.Davi Arnaut2009-11-022-0/+20
| | | |\
| | | | * Bug#41728: Dropped symbol but no soname changeDavi Arnaut2009-09-292-72/+84
| | | * | A follow-up to fix forSergey Vojtovich2009-10-271-0/+4
| | * | | Bug#47571: idle named pipe connection is unkillableVladislav Vaintroub2009-11-021-2/+6
| | |/ /
| | * | Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clashMagnus BlÄudd2009-10-061-1/+0
| | * | 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
| | * | 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
* | | | Fixes after comments from last push:Michael Widenius2009-11-303-10/+16
* | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-302-4/+4
* | | | Automatic mergeMichael Widenius2009-11-251-2/+3
|\ \ \ \ | |/ / /
| * | | Added error handling for my_seek() & my_tell() failuresMichael Widenius2009-11-071-2/+3
* | | | Safety change to ensure read/black trees (used with heap tables) works on 64 ...Michael Widenius2009-11-161-2/+2
|/ / /
* | | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-061-0/+19
|\ \ \
| * \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-0/+19
| |\ \ \ | | |/ /
| | * | Merge from 5.0 for 43414Staale Smedseng2009-08-281-0/+19
| | |\ \ | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-0/+13
* | | | Fixed compiler warning messageMichael Widenius2009-10-261-1/+2
|/ / /
* | | Added client functions:Michael Widenius2009-10-022-0/+4
* | | MWL#17: Table elimination: fixes for windowsSergey Petrunya2009-09-161-0/+1
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-2/+1
|\ \ \
| * | | MWL#17: Table-eliminationSergey Petrunya2009-09-011-2/+1
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-0812-66/+108
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-114-10/+33
| |\ \
| | * \ Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-144-4/+5
| | |\ \
| | * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-104-10/+33
| * | | | Auto-mergeIgnacio Galarza2009-07-312-2/+4
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-312-2/+4
| * | | | Bug#45800 crash when replacing into a merge table and there is a duplicateV Narayanan2009-07-301-0/+1
| * | | | merge 5.0-bugteam to 5.1-bugteamSatya B2009-07-241-1/+2
| |\ \ \ \ | | |/ / /
| | * | | merge to mysql-5.0-bugteamSatya B2009-07-241-1/+9
| | |\ \ \