Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | More after-merge fixes for merging MySQL 5.1.38 into MariaDB. | unknown | 2009-09-15 | 1 | -2/+3 |
* | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 2 | -2/+4 |
|\ | |||||
| * | Fix most Compiler warnings seen in buildbot. | unknown | 2009-09-03 | 1 | -2/+3 |
| * | MBug#423035: error in parsing enum value for plugin variable in mysqld comman... | unknown | 2009-09-03 | 1 | -1/+4 |
* | | After-merge fix for MySQL 5.1.38 merge into MariaDB. | unknown | 2009-09-11 | 1 | -2/+8 |
* | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 11 | -42/+94 |
|\ \ | |/ |/| | |||||
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1. | Sergey Vojtovich | 2009-08-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge 5.1-bugteam -> 5.1-innodb_plugin. | Sergey Vojtovich | 2009-07-14 | 2 | -9/+42 |
| | |\ | |||||
| | * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -1/+1 |
| * | | | Auto-merge | Ignacio Galarza | 2009-07-31 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails. | Ignacio Galarza | 2009-07-31 | 1 | -1/+1 |
| * | | | | merging with mysql-5.1-bugteam branch | Satya B | 2009-07-27 | 1 | -7/+7 |
| |\ \ \ \ | |||||
| | * \ \ \ | merging with mysql-5.0-bugteam | V Narayanan | 2009-07-17 | 1 | -7/+7 |
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| | | |||||
| | | * | | Bug#43572 Handle failures from hash_init | V Narayanan | 2009-07-12 | 1 | -6/+7 |
| * | | | | merge 5.0-bugteam to 5.1-bugteam | Satya B | 2009-07-24 | 1 | -1/+2 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| * | | | Automerge | Kristofer Pettersson | 2009-06-25 | 1 | -2/+13 |
| |\ \ \ | |||||
| | * | | | Bug#45336 --enable-foobar doesn't work for any plugin foobar. | Kristofer Pettersson | 2009-06-25 | 1 | -2/+13 |
| * | | | | Bug#43572 Handle failures from hash_init | V Narayanan | 2009-06-22 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | merging with mysql-5.0-bugteam | V Narayanan | 2009-06-19 | 1 | -7/+29 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Bug#43572 Handle failures from hash_init | V Narayanan | 2009-06-19 | 1 | -6/+29 |
| * | | auto-merge 5.1-bugteam (local) --> 5.1-bugteam | Alfranio Correia | 2009-05-21 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | BUG#43949 Initialization of slave produces a warning message in Valgrind | Alfranio Correia | 2009-04-19 | 1 | -1/+1 |
| * | | | Auto merge | Kristofer Pettersson | 2009-05-15 | 1 | -1/+2 |
| |\ \ \ | |||||
| | * | | | Bug#19027 MySQL 5.0 starts even with Fatal InnoDB errors | Kristofer Pettersson | 2009-05-14 | 1 | -1/+2 |
| | |/ / | |||||
| * | | | Merge from 5.0-bugteam | Jim Winstead | 2009-05-13 | 1 | -4/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | The get_date() function in mysys interpreted the GETDATE_GMT option | Jim Winstead | 2009-05-07 | 1 | -4/+4 |
| * | | | Bug#43932 myisam index corruption with large index and large | Vladislav Vaintroub | 2009-04-29 | 2 | -3/+5 |
| | |/ | |/| | |||||
| * | | Bug#43706: libmysqld segfaults when re-intialised | Davi Arnaut | 2009-04-09 | 1 | -0/+4 |
| * | | Bug#42649 THR_LOCK_charset global mutex abused by InnoDB | Alexander Barkov | 2009-04-07 | 1 | -15/+26 |
* | | | Merge XtraDB 6 with latest MariaDB 5.1 | unknown | 2009-08-03 | 2 | -29/+87 |
|\ \ \ | |||||
| * | | | More XtraDB after-merge fixes following review and buildbot runs: | unknown | 2009-06-22 | 1 | -0/+6 |
| * | | | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 2 | -30/+82 |
| |\ \ \ | |||||
| | * | | | Merge latest XtraDB from lp:percona-xtradb into MariaDB. | unknown | 2009-06-11 | 1 | -0/+49 |
| | * | | | XtraDB after-merge fixes. | unknown | 2009-06-09 | 1 | -30/+33 |
* | | | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l... | Michael Widenius | 2009-07-02 | 1 | -0/+3 |
|/ / / / | |||||
* | | | | After-merge fixes for problems seen in buildbot after merging MySQL-5.1.35. | unknown | 2009-05-22 | 1 | -4/+70 |
* | | | | Fix accessing ulong enum option as uint, failing on 64-bit big-endian. | unknown | 2009-05-20 | 1 | -3/+3 |
* | | | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 5 | -7/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 5 | -7/+7 |
* | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 19 | -58/+100 |
|\ \ \ \ | |||||
| * | | | | Apply 64-bit fix from Azundris. | Jonathan Perkin | 2009-03-31 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
| * | | | merged 5.0-bugteam -> 5.1-bugteam | Georgi Kodinov | 2009-03-24 | 2 | -3/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug#43461: invalid comparison with string literal in default.c | Davi Arnaut | 2009-03-19 | 2 | -3/+4 |
| | * | | auto-merge | Ignacio Galarza | 2009-03-19 | 5 | -318/+283 |
| | |\ \ | |||||
| * | | | | fixed compilation warnings. addendum to the fix for bug 29125 | Georgi Kodinov | 2009-03-20 | 1 | -1/+1 |
| * | | | | Fixed a prototype to match the actual function signature (addendum to the | Georgi Kodinov | 2009-03-20 | 1 | -1/+1 |
| * | | | | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -4/+9 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge bugteam and fix for 42675. | Chad MILLER | 2009-03-18 | 1 | -4/+9 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix indentation. tab -> spaces | Chad MILLER | 2009-03-17 | 1 | -1/+1 |
| | | * | | | | Bug#42675: Dangling pointer leads to a client crash (mysys/my_error.c \ | Chad MILLER | 2009-03-17 | 1 | -4/+9 |