Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -4/+6 |
|\ | |||||
| * | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 1 | -4/+6 |
| |\ | |||||
| | * | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST | Nirbhay Choubey | 2012-08-07 | 1 | -8/+13 |
* | | | Merge from 5.1. | unknown | 2012-08-24 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | Fix compiler warnings | unknown | 2012-08-24 | 1 | -2/+1 |
| * | | Merge with latest 5.1. | unknown | 2012-08-24 | 1 | -0/+2 |
| |\ \ | |||||
* | \ \ | Merge into latest 5.2. | unknown | 2012-08-24 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge from 5.1. | unknown | 2012-08-24 | 1 | -0/+3 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | MDEV-382: Incorrect quoting | unknown | 2012-08-24 | 1 | -0/+2 |
* | | | | | 5.1 merge | Sergei Golubchik | 2012-08-22 | 2 | -5/+8 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 2 | -5/+7 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Bug #13708485: malformed resultset packet crashes client | Georgi Kodinov | 2012-06-28 | 1 | -3/+5 |
| | * | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING) | Jon Olav Hauglid | 2012-06-29 | 1 | -2/+2 |
* | | | Fixed LP bug #1008293. | Igor Babaev | 2012-06-11 | 1 | -1/+2 |
* | | | 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 |
| | * | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ... | Tatjana Azundris Nuernberg | 2012-02-17 | 1 | -0/+3 |
* | | | 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 |
| | |\ | |||||
| | | * | 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 |
| | | | |\ | |||||
| | * | | \ | 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#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8... | Alexander Barkov | 2012-01-23 | 1 | -0/+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 |
* | | | | | 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 |
* | | | | | Fix MDEV-49 : version_compile_machine server variable is 'unknown' for x64 bu... | Vladislav Vaintroub | 2012-01-10 | 1 | -2/+2 |
* | | | | | 1. add --plugin-dir and --default-auth to mysqltest. | Sergei Golubchik | 2011-12-02 | 5 | -22/+30 |
* | | | | | 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 |
| | | |\ \ \ \ | | | | |/ / / | | | | | / / | | | | |/ / | | | |/| | |