Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -7/+7 |
|\ | |||||
| * | MDEV-4156 Test cases query_cache and query_cache_size_basic fail on 32 bit pp... | Sergei Golubchik | 2013-02-08 | 1 | -7/+7 |
* | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 2 | -3/+3 |
|\ \ | |/ | |||||
| * | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 2 | -3/+3 |
| |\ | |||||
| | * | Bug#14498355: DEPRECATION WARNINGS SHOULD NOT CONTAIN MYSQL VERSION | Martin Hansson | 2012-08-24 | 1 | -2/+2 |
| | * | Merging from 5.1 | Alexander Barkov | 2012-07-24 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Fixing wrong copyright. Index.xml was modified in 2005, | Alexander Barkov | 2012-07-24 | 1 | -1/+1 |
* | | | | SHOW EXPLAIN: merge to 10.0-base. | Sergey Petrunya | 2012-10-06 | 1 | -4/+6 |
|\ \ \ \ | |||||
| * \ \ \ | SHOW EXPLAIN: merge with 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -3/+5 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge 5.5-main -> 5.5-show-explain | Sergey Petrunya | 2012-07-25 | 1 | -0/+3 |
| | |\ \ \ | |||||
| | * | | | | MWL#182: Explain running statements | Sergey Petrunya | 2012-07-17 | 1 | -3/+5 |
* | | | | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC. | Michael Widenius | 2012-10-03 | 1 | -12/+18 |
* | | | | | | Fixed issues found by QA (Elena) | Michael Widenius | 2012-09-28 | 1 | -2/+1 |
* | | | | | | Implementation of Multi-source replication (MDEV:253) | Michael Widenius | 2012-09-28 | 1 | -7/+12 |
* | | | | | | Automatic merge with 5.5 | Michael Widenius | 2012-09-01 | 1 | -0/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Split ER_NO_SUCH_TABLE into ER_NO_SUCH_TABLE and ER_NO_SUCH_TABLE_IN_ENGINE t... | Michael Widenius | 2012-08-28 | 1 | -0/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 1 | -0/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 1 | -0/+3 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * | | Merge 5.5.24 back into main 5.5. | Joerg Bruehe | 2012-05-07 | 1 | -0/+3 |
| | |\ \ | |||||
| | * \ \ | merge bug11754117-45670 fixes from 5.1. | Andrei Elkin | 2012-04-21 | 1 | -0/+3 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
* | | | | | Fixes after Serg's review of %M extenstions | Michael Widenius | 2012-06-17 | 1 | -2/+2 |
* | | | | | Merge with 5.5 | Michael Widenius | 2012-05-31 | 2 | -2/+11 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | create a new MariaDB-common.rpm that contains files needed both by the client... | Sergei Golubchik | 2012-05-25 | 1 | -2/+2 |
| * | | | | c | Sergei Golubchik | 2012-05-21 | 1 | -0/+9 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2012-04-12 | 1 | -0/+3 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#11815557 60269: MYSQL SHOULD REJECT ATTEMPTS TO CREATE SYSTEM | unknown | 2012-04-11 | 1 | -0/+3 |
| | * | | | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2012-04-10 | 1 | -0/+3 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | BUG#11765650 - 58637: MARK UPDATES THAT DEPEND ON ORDER OF TWO KEYS UNSAFE | Rohit Kalhans | 2012-03-30 | 1 | -0/+3 |
| | * | | | Merge from mysql-5.5 to mysql-5.5-security | Jon Olav Hauglid | 2012-03-15 | 1 | -0/+3 |
| | |\ \ \ | | | |/ / | |||||
| | * | | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DML | Annamalai Gurusami | 2012-02-27 | 1 | -0/+3 |
* | | | | | Added text for errno in error messages by: | Michael Widenius | 2012-05-30 | 1 | -583/+583 |
|/ / / / | |||||
* | | | | mysql 5.5.23 merge | Sergei Golubchik | 2012-04-10 | 1 | -1/+4 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Bug#13833438: ERROR CODES MUST HAVE SAME VALUE ACROSS MYSQL VERSIONS | Jon Olav Hauglid | 2012-03-15 | 1 | -0/+3 |
| |/ / | |||||
* | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -8/+15 |
|\ \ \ | |/ / | |||||
| * | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFE | Rohit Kalhans | 2012-02-09 | 1 | -0/+8 |
| * | | Backout the patch for bug#11758263. | Rohit Kalhans | 2012-02-08 | 1 | -8/+0 |
| * | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFE | Rohit Kalhans | 2012-02-08 | 1 | -0/+8 |
| * | | bug#3593869-64035 | Andrei Elkin | 2012-01-19 | 1 | -8/+8 |
* | | | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5. | unknown | 2012-03-12 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Implementation of MDEV-28 LIMIT ROWS EXAMINED | unknown | 2012-03-11 | 1 | -1/+2 |
| * | | | Fixed that 'make distcheck' works with automake 1.11.11 | Michael Widenius | 2012-02-21 | 1 | -0/+1 |
* | | | | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 1 | -8/+8 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | BUG#13593869 - 64035: SEVERAL ERRORS IN COM_BINLOG_DUMP/MYSQL_BINLOG_SEND CRA... | Andrei Elkin | 2012-01-18 | 1 | -8/+8 |
* | | | | Merge MWL#234: @@skip_replication feature to MariaDB 5.5. | unknown | 2012-03-01 | 1 | -1/+4 |
|\ \ \ \ | |||||
* | | | | | query cache sysvar fixes | Sergei Golubchik | 2012-01-16 | 1 | -2/+1 |
* | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-10-12 | 1 | -93/+164 |
| |\ \ \ \ | |||||
| * | | | | | Fixed Bug#12621017 - CRASH IF A SP VARIABLE IS USED IN THE LIMIT CLAUSE OF A | Dmitry Shulga | 2011-08-13 | 1 | -1/+1 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -0/+1 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 3 | -6/+6 |
| |\ \ \ \ \ |