Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 12 | -54/+157 |
* | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -0/+9 |
* | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 19 | -838/+4271 |
* | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 2 | -4/+5 |
|\ | |||||
| * | Merge 5.3 -> 5.5 | Sergey Petrunya | 2012-06-20 | 1 | -1/+2 |
| |\ | |||||
| | * | Merge 5.2->5.3 | Sergey Petrunya | 2012-06-18 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Fixed LP bug #1008293. | Igor Babaev | 2012-06-11 | 1 | -1/+2 |
| | * | | 5.2 merge | Sergei Golubchik | 2012-05-20 | 2 | -5/+9 |
| | |\ \ | | | |/ | |||||
| | | * | 5.1 merge | Sergei Golubchik | 2012-05-18 | 2 | -3/+8 |
| | | |\ | |||||
| | | | * | merge with mysql-5.1.63 | Sergei Golubchik | 2012-05-17 | 2 | -3/+8 |
| | | | |\ | |||||
| | | | | * | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DML | Annamalai Gurusami | 2012-03-01 | 1 | -1/+6 |
| * | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge 5.5.24 back into main 5.5. | Joerg Bruehe | 2012-05-07 | 2 | -8/+12 |
| | |\ \ \ \ \ | |||||
* | | | | | | | | Fixes after Serg's review of %M extenstions | Michael Widenius | 2012-06-17 | 1 | -0/+94 |
* | | | | | | | | Merge with 5.5 | Michael Widenius | 2012-05-31 | 5 | -28/+19 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Building RPMs with CPack | Sergei Golubchik | 2012-05-22 | 1 | -0/+2 |
| * | | | | | | | more portable fix for lp:942266 - 5.5 builds fail with systemtap-sdt-dev inst... | Sergei Golubchik | 2012-05-11 | 2 | -20/+4 |
| * | | | | | | | c | Sergei Golubchik | 2012-05-21 | 2 | -8/+12 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DML | Annamalai Gurusami | 2012-02-27 | 1 | -5/+6 |
| | * | | | | | | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ... | Tatjana Azundris Nuernberg | 2012-02-19 | 1 | -0/+3 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ... | Tatjana Azundris Nuernberg | 2012-02-17 | 1 | -0/+3 |
* | | | | | | | Added text for errno in error messages by: | Michael Widenius | 2012-05-30 | 2 | -9/+13 |
|/ / / / / / | |||||
* | | | | | | MDEV-207 Install headers required to build external storage plugins | Sergei Golubchik | 2012-05-05 | 1 | -6/+17 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-05-04 | 3 | -106/+0 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | MDEV-207 Install headers required to build external storage plugins | Sergei Golubchik | 2012-04-23 | 2 | -77/+9 |
* | | | | | | merge | Sergei Golubchik | 2012-04-07 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | merge | Sergei Golubchik | 2012-04-05 | 3 | -3/+8 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | merge | Sergei Golubchik | 2012-04-05 | 3 | -3/+8 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 3 | -3/+9 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | merge mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2012-02-17 | 2 | -2/+2 |
| | | | |\ \ | |||||
* | | | | | | | lp:886550 Wrong installation path for some include files. | unknown | 2012-04-03 | 1 | -11/+3 |
* | | | | | | | Define dummy my_init_stacktrace() to allow one to call it without #ifdef HAVE... | Michael Widenius | 2012-04-03 | 1 | -3/+5 |
* | | | | | | | debug_sync is now a service, available to dynamically loaded plugins. | Sergei Golubchik | 2012-03-28 | 8 | -12/+363 |
* | | | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 6 | -8/+10 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | merged mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2012-02-17 | 5 | -5/+5 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 5 | -5/+5 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 2 | -2/+2 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-15 | 2 | -3/+2 |
| | | | * | | | | | auto-merge mysql-5.0->mysql-5.0-security | Georgi Kodinov | 2011-10-12 | 2 | -1/+32 |
| | | | |\ \ \ \ \ | |||||
| * | | | \ \ \ \ \ | Upmerge the AIX compile fix into 5.5. | Joerg Bruehe | 2012-02-16 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Merge compile fix for AIX into delivery tree. | Joerg Bruehe | 2012-02-16 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | | * | | | | | | Compile fix needed for AIX, | Joerg Bruehe | 2012-01-19 | 1 | -1/+3 |
| * | | | | | | | | BUG#11754145 - 45702: IMPOSSIBE TO SPECIFY MYISAM_SORT_BUFFER > 4GB | Ashish Agarwal | 2012-02-02 | 1 | -2/+2 |
* | | | | | | | | | a couple of minor post-5.5-merge cleanups | Sergei Golubchik | 2012-03-26 | 2 | -7/+2 |
* | | | | | | | | | Merge MariaDB 5.3 into latest MariaDB 5.5 | unknown | 2012-03-24 | 2 | -44/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge mariadb 5.3->mariadb 5.5 | unknown | 2012-03-24 | 2 | -44/+4 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| | * | | | | | | | | merge | Sergei Golubchik | 2012-03-21 | 2 | -44/+4 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | |||||
| | | * | | | | | | | merge | Sergei Golubchik | 2012-03-21 | 2 | -44/+4 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | |||||
| | | | * | | | | | | restore my_safe_printf_stderr for "crash-safe sigsegv handler" | Sergei Golubchik | 2012-03-14 | 2 | -44/+4 |
| | * | | | | | | | | Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable ke... | Michael Widenius | 2012-02-28 | 1 | -0/+1 |