Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 2 | -1/+11 |
* | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 7 | -51/+851 |
* | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 1 | -55/+197 |
|\ | |||||
| * | Merge 5.3 -> 5.5 | Sergey Petrunya | 2012-06-20 | 1 | -55/+197 |
| |\ | |||||
| | * | Merge 5.2->5.3 | Sergey Petrunya | 2012-06-18 | 1 | -55/+197 |
| | |\ | |||||
| | | * | Fixed LP bug #1008293. | Igor Babaev | 2012-06-11 | 1 | -55/+197 |
| | * | | 5.2 merge | Sergei Golubchik | 2012-05-20 | 1 | -2/+3 |
| | |\ \ | | | |/ | |||||
| | | * | 5.1 merge | Sergei Golubchik | 2012-05-18 | 1 | -1/+4 |
| | | |\ | |||||
| | | | * | merge with mysql-5.1.63 | Sergei Golubchik | 2012-05-17 | 1 | -1/+4 |
| | | | |\ | |||||
| | | | | * | merge mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2012-03-08 | 1 | -1/+1 |
| | | | | |\ | |||||
| | | | | * | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DML | Annamalai Gurusami | 2012-03-01 | 1 | -1/+5 |
| | * | | | | | merge | Sergei Golubchik | 2012-04-05 | 2 | -2/+4 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | merge | Sergei Golubchik | 2012-04-05 | 2 | -2/+4 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 2 | -2/+4 |
| | | | |\ \ \ | | | | | |/ / | |||||
* | | | | | | | Fixes after Serg's review of %M extenstions | Michael Widenius | 2012-06-17 | 1 | -94/+0 |
* | | | | | | | Merge with 5.5 | Michael Widenius | 2012-05-31 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | c | Sergei Golubchik | 2012-05-21 | 1 | -4/+4 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2012-04-10 | 1 | -2/+5 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2012-03-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DML | Annamalai Gurusami | 2012-02-27 | 1 | -4/+5 |
* | | | | | | | | | | Added text for errno in error messages by: | Michael Widenius | 2012-05-30 | 2 | -56/+59 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Fix FreeBSD test errors. Also link with libexecinfo on FreeBSD for stacktrac... | Vladislav Vaintroub | 2012-05-04 | 1 | -1/+1 |
* | | | | | | | | | add a space between safemalloc error mesage and a stack trace | Sergei Golubchik | 2012-04-18 | 1 | -0/+1 |
* | | | | | | | | | fix compile error on unixes | Vladislav Vaintroub | 2012-04-15 | 1 | -1/+2 |
* | | | | | | | | | fix application verifier crashes | Vladislav Vaintroub | 2012-04-15 | 3 | -2/+10 |
* | | | | | | | | | mysql 5.5.23 merge | Sergei Golubchik | 2012-04-10 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Bug#13898343 THREAD LOOPS ENDLESSLY IN LF_PINBOX_PUT_PINS WHILE HOLDING | Marc Alff | 2012-03-28 | 1 | -2/+5 |
| | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge 5.1 => 5.5 | Tor Didriksen | 2012-03-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS | Tor Didriksen | 2012-03-06 | 1 | -1/+1 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge of compatibility fixes | Michael Widenius | 2012-04-02 | 1 | -4/+1 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Compatibility fixes by U Orsini | Michael Widenius | 2012-03-30 | 1 | -1/+1 |
* | | | | | | 1. support for testing statically built oqgraph | Sergei Golubchik | 2012-03-30 | 1 | -0/+21 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-03-28 | 1 | -0/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fixed lp:963603 "Assertion `lock_type != TL_UNLOCK && (lock_type == TL_IGNORE... | Michael Widenius | 2012-03-26 | 1 | -0/+3 |
* | | | | | | debug_sync is now a service, available to dynamically loaded plugins. | Sergei Golubchik | 2012-03-28 | 1 | -7/+1 |
* | | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 5 | -6/+5 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 3 | -4/+3 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 2 | -2/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-15 | 3 | -5/+3 |
| | | * | | | | Fix for BUG#13596377: MYSQL CRASHES ON STARTUP ON FREEBSD IN PB2 | Ramil Kalimullin | 2012-01-30 | 1 | -4/+6 |
| | | * | | | | Merge from mysql-5.0.94-release | Sunanda Menon | 2011-07-06 | 1 | -1/+16 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 7 | -294/+111 |
| | | |\ \ \ \ \ | |||||
* | | | | | | | | | move DBUG_END() after my_thread_global_end(), when all threads have already d... | Sergei Golubchik | 2012-03-26 | 1 | -2/+3 |
* | | | | | | | | | a couple of minor post-5.5-merge cleanups | Sergei Golubchik | 2012-03-26 | 1 | -1/+1 |
* | | | | | | | | | Small Windows specific performance fixes: | Vladislav Vaintroub | 2012-03-25 | 1 | -11/+17 |
* | | | | | | | | | Merge mariadb 5.3->mariadb 5.5 | unknown | 2012-03-24 | 2 | -184/+6 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | merge | Sergei Golubchik | 2012-03-21 | 1 | -186/+8 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | merge | Sergei Golubchik | 2012-03-21 | 1 | -186/+8 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | restore my_safe_printf_stderr for "crash-safe sigsegv handler" | Sergei Golubchik | 2012-03-14 | 1 | -186/+8 |
* | | | | | | | | | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -8/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |