Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -4/+65 |
|\ | |||||
| * | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -4/+65 |
| |\ | |||||
| | * | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -4/+65 |
| | |\ | |||||
| | | * | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS | Tor Didriksen | 2011-11-30 | 1 | -4/+65 |
* | | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc. | Igor Babaev | 2012-02-01 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix MDEV-49 : version_compile_machine server variable is 'unknown' for x64 bu... | Vladislav Vaintroub | 2012-01-10 | 1 | -2/+2 |
* | | | | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 5 | -22/+30 |
|\ \ \ \ | |/ / / | |||||
| * | | | 1. add --plugin-dir and --default-auth to mysqltest. | Sergei Golubchik | 2011-12-02 | 5 | -22/+30 |
* | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 32 | -59/+184 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with 5.1 + fixes for build failures in 5.2 | Michael Widenius | 2011-11-29 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed that maria-recover works as expected. | Michael Widenius | 2011-11-29 | 1 | -0/+2 |
| * | | | merge, fix Windows warnings | Vladislav Vaintroub | 2011-11-29 | 1 | -0/+3 |
| * | | | Automatic merge | Michael Widenius | 2011-11-24 | 28 | -58/+164 |
| |\ \ \ | |||||
| | * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 28 | -58/+164 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 2 | -0/+11 |
| | | |\ \ | | | | |/ | |||||
| | | | * | BUG#11759349 - 51655: CREATE TABLE IN MEMORY ENGINE DOESN'T STORE | Ashish Agarwal | 2011-09-27 | 1 | -0/+2 |
| | | | * | Merge from mysql-5.1.59-release | unknown | 2011-09-15 | 1 | -0/+9 |
| | | | |\ | |||||
| | | | | * | Manual merge from mysql-5.1. | Ramil Kalimullin | 2011-08-09 | 2 | -1/+32 |
| | | | | |\ | |||||
| | | | | * \ | merge 5.0-security => 5.1-security | Tor Didriksen | 2011-07-15 | 1 | -0/+9 |
| | | | | |\ \ | |||||
| | | | | | * | | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REAL | Tor Didriksen | 2011-07-15 | 1 | -0/+9 |
| | | * | | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 28 | -60/+156 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | BUG#12911710 - VALGRIND FAILURE IN ROW-DEBUG:PERFSCHEMA.SOCKET_SUMMARY_BY_INS... | Tor Didriksen | 2011-08-29 | 1 | -0/+9 |
| | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | BUG#12695969 | Luis Soares | 2011-07-12 | 1 | -1/+1 |
| | | | |\ \ \ | |||||
| | | | | * | | | BUG#12695969 | Luis Soares | 2011-07-12 | 1 | -1/+1 |
| | | | * | | | | BUG#12695969 | Luis Soares | 2011-07-11 | 1 | -0/+31 |
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | / / | | | | | |/ / | | | | |/| | | |||||
| | | | | * | | BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTION | Luis Soares | 2011-07-11 | 1 | -0/+31 |
| | | | | |/ | |||||
| | | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 5 | -25/+20 |
| | | | | |\ | |||||
| | | | | | * | Bug#11896296 REMOVE LGPL LICENSED FILES IN MYSQL 5.0 | Magne Mahre | 2011-03-22 | 5 | -22/+19 |
| | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 10 | -149/+138 |
| | | | |\ \ \ | |||||
| | | | | * | | | BUG 11763056 - 55721: AIX 5.1.50 build failing, cannot locate bzero | Davi Arnaut | 2011-05-27 | 1 | -1/+1 |
| | | | | * | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -3/+5 |
| | | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 26 | -51/+121 |
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | |||||
| | | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 14 | -26/+38 |
| | | | | | |/ | | | | | |/| | |||||
| * | | | | | | fix dialog plugin to work on windows | Sergei Golubchik | 2011-11-22 | 2 | -0/+15 |
| |/ / / / / | |||||
* | | | | | | Fixes for netware by Guenter Knauf | Michael Widenius | 2011-12-02 | 1 | -0/+1 |
* | | | | | | Patch to get MariaDB to compile on CYGWIN; By Guenter Knauf | Michael Widenius | 2011-12-02 | 1 | -0/+2 |
* | | | | | | Fix bug lp:869036 | unknown | 2011-11-17 | 1 | -0/+4 |
* | | | | | | Merge. | Igor Babaev | 2011-10-28 | 1 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge. | Igor Babaev | 2011-06-01 | 1 | -1/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Downported InnoDB support of Index Condition Pushdown from MySQL-5.6 code line. | Igor Babaev | 2011-05-25 | 1 | -1/+3 |
* | | | | | | | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys... | Michael Widenius | 2011-10-26 | 2 | -0/+4 |
* | | | | | | | | merge | Sergei Golubchik | 2011-10-11 | 1 | -5/+19 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 1 | -5/+19 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | support for plugins on windows | Sergei Golubchik | 2011-10-04 | 1 | -5/+19 |
| | * | | | | | | Post-fix for LP808233 : replace uint with "unsigned int" in mysql.h.pp, too | Vladislav Vaintroub | 2011-07-10 | 1 | -1/+1 |
| | * | | | | | | LPBUG#808233: Undefined uint in typelib.h | Vladislav Vaintroub | 2011-07-10 | 1 | -1/+1 |
* | | | | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 2 | -6/+9 |
* | | | | | | | | portability fix: avoid anonymous structs and unions in C | Sergei Golubchik | 2011-09-22 | 1 | -6/+6 |
* | | | | | | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -1/+1 |