Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -1/+1 |
* | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
* | MDEV-6152: Remove calls to current_thd while creating Item | Monty | 2015-08-27 | 1 | -8/+17 |
* | Stage 2 of MDEV-6152: | Monty | 2015-08-21 | 1 | -6/+7 |
* | MDEV-8010 - Avoid sql_alloc() in Items (Patch #1) | Sergey Vojtovich | 2015-08-21 | 1 | -6/+6 |
* | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | Merge 10.0-base -> 10.0 (GTID). | unknown | 2013-04-17 | 1 | -4/+5 |
|\ | |||||
| * | MDEV-500: Session variable for server_id | unknown | 2012-10-23 | 1 | -4/+5 |
* | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Merge from 5.3 | unknown | 2012-08-24 | 1 | -1/+0 |
| |\ | |||||
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -2/+0 |
|/ / | |||||
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | |\ | |||||
* | | \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ | |||||
| | | * \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -6/+9 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
* | | | \ \ \ \ | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -2/+4 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | BUG#53657: Slave crashed with error 22 when trying to lock mutex | Luis Soares | 2010-05-24 | 1 | -1/+1 |
| | * | | | | Bug#49501 Inefficient information_schema check (system collation), addon | Sergey Glukhov | 2010-01-22 | 1 | -1/+1 |
| | * | | | | Bug#49501 Inefficient information_schema check (system collation) | Sergey Glukhov | 2010-01-19 | 1 | -1/+1 |
| * | | | | | Fix a bunch of Windows warnings | Bo Thorsen | 2010-04-21 | 1 | -0/+5 |
| |/ / / / | |||||
* | | | | | WL#5670: Proposal: Remove SHOW NEW MASTER statement | Sven Sandberg | 2011-02-16 | 1 | -366/+0 |
* | | | | | Fix for crash in mysqld --verbose --help while initializing option | Luis Soares | 2010-10-11 | 1 | -2/+2 |
* | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -3/+0 |
* | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -96/+0 |
* | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -2/+2 |
* | | | | | WL#5419 "LOCK_open scalability: make tdc_refresh_version | Konstantin Osipov | 2010-06-11 | 1 | -1/+0 |
* | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+4 |
* | | | | | Patch to eliminate warnings in mysql-next-mr-bugteam. | Mats Kindahl | 2010-01-25 | 1 | -1/+1 |
* | | | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-14 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | WL#2360 Performance schema | Marc Alff | 2010-01-11 | 1 | -4/+4 |
* | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -32/+57 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -32/+57 |
* | | | | | | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -5/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -5/+2 |
* | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -2/+9 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-21 | 1 | -2/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | BUG#49259: Slave I/O thread could not register on master | Luis Soares | 2009-12-18 | 1 | -2/+9 |
| * | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Alfranio Correia | 2009-12-17 | 1 | -1/+6 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | |||||
* | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -1/+6 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -13/+14 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Bug#45613 handle failures from my_hash_insert | Kristofer Pettersson | 2009-11-20 | 1 | -1/+6 |
* | | | | | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -330/+2 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| * | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 1 | -324/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -324/+0 |