summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-2/+0
* Automatic merge with 5.1Michael Widenius2011-01-101-0/+4
|\
| * - Fixed that Aria works with HANDLER commandsMichael Widenius2011-01-101-0/+4
* | merge with 5.1Michael Widenius2010-12-131-6/+4
|\ \ | |/
| * Fixed typo that caused compile failure in thr_lock.cMichael Widenius2010-12-131-1/+1
| * Better warning message if lock test failsMichael Widenius2010-12-101-6/+4
* | mergeVladislav Vaintroub2010-12-061-1/+0
|\ \ | |/
| * Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-1/+0
* | merge with 5.1Michael Widenius2010-11-308-45/+84
|\ \ | |/
| * Fixed some compiler warningsMichael Widenius2010-11-301-0/+2
| * Merge with MySQL 5.1.53Michael Widenius2010-11-255-31/+38
| |\
| | * merge to 5.1-securityGeorgi Kodinov2010-10-294-30/+46
| | |\
| | | * Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-202-21/+15
| | | * Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-191-1/+1
| | | * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-10-192-8/+30
| | * | Bug#57359 Possible to circumvent secure_file_priv using '..' on WindowsKristofer Pettersson2010-10-171-1/+16
| | |/
| * | Merge with MySQL 5.1.52Michael Widenius2010-11-232-14/+44
| |\ \ | | |/
| | * mergeGeorgi Kodinov2010-10-051-12/+43
| | |\
| | | * Bug #56427 : Replace copyright notice removed from SHA1 codeGeorgi Kodinov2010-10-051-12/+43
| | | * Bug #51893: crash with certain characters given to load_file Georgi Kodinov2010-03-301-0/+3
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-09-241-2/+1
* | | | Merge MariaDB 5.1->5.2unknown2010-11-193-14/+37
|\ \ \ \ | |/ / /
| * | | MWL#74: Shared libmysqld.so library.unknown2010-11-172-6/+12
| * | | Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th...Michael Widenius2010-11-071-8/+25
* | | | Automatic merge with 5.1Michael Widenius2010-11-043-61/+152
|\ \ \ \ | |/ / /
| * | | Fixed compiler & valgrind warnings from my previous push.Michael Widenius2010-11-031-0/+1
| * | | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-023-61/+151
* | | | merge w/ 5.1Sergei Golubchik2010-10-291-0/+2
|\ \ \ \ | |/ / /
* | | | sane implementation of Key_% status variables.Sergei Golubchik2010-10-291-159/+0
* | | | merge with 5.1Sergei Golubchik2010-10-251-12/+15
|\ \ \ \ | |/ / /
| * | | 5.1.51 mergeSergei Golubchik2010-10-191-12/+15
| |\ \ \ | | |/ /
| | * | Bug #42144: plugin_load failsGeorgi Kodinov2010-08-041-5/+5
| | * | Bug #42144: plugin_load failsGeorgi Kodinov2010-08-031-10/+14
* | | | Automatic merge with 5.1Michael Widenius2010-10-061-81/+98
|\ \ \ \ | |/ / /
| * | | Fix for Bug#43152 "Assertion `bitmap_is_set_all(&table->s->all_set)' failed i...Michael Widenius2010-10-061-81/+98
* | | | merge with 5.1Sergei Golubchik2010-09-161-1/+1
|\ \ \ \ | |/ / /
| * | | mysqltest now gives error messages with error code for my_delete, my_rename, ...Michael Widenius2010-09-151-1/+1
* | | | merge with 5.1Sergei Golubchik2010-09-1112-39/+87
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-2712-39/+87
| |\ \ \ | | |/ /
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-301-1/+3
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-204-14/+47
| | * | Bug#22320: my_atomic-t unit test failsDavi Arnaut2010-07-052-47/+1
| | * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-028-24/+18
* | | | Automerge with 5.1Michael Widenius2010-08-251-5/+5
|\ \ \ \ | |/ / /
| * | | missing DBUG_RETURNsSergei Golubchik2010-08-141-5/+5
* | | | Merge with 5.1Michael Widenius2010-08-111-1/+1
|\ \ \ \ | |/ / /
| * | | Fixed typo that caused compile failure on MacMichael Widenius2010-08-101-1/+1
* | | | Merge with 5.1 to get in critical bug fix that caused Aria tests to failMichael Widenius2010-08-101-0/+2
|\ \ \ \ | |/ / /
| * | | Ignore ENOLCK errno from FreeBSD (known problem in old FreeBSD releases)Michael Widenius2010-08-091-0/+2
* | | | Merge with 5.2Michael Widenius2010-08-092-0/+4
|\ \ \ \ | |/ / /