Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -0/+2 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -0/+2 |
| |\ | |||||
| | * | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria... | Michael Widenius | 2014-01-22 | 1 | -0/+2 |
* | | | MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work | Sergei Golubchik | 2013-12-09 | 1 | -0/+3 |
* | | | Client attributes | unknown | 2013-10-03 | 1 | -0/+3 |
* | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -0/+1 |
| | |\ | |||||
| | | * | Bug#16607258 :Linker Errors Due To Inclusion Of An Implementation File | Shubhangi Garg | 2013-05-14 | 1 | -0/+1 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+1 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -7/+15 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -7/+15 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -3/+13 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | BUG#16698172-CANNOT DO POINT-IN-TIME RECOVERY FOR | Venkatesh Duggirala | 2013-04-25 | 1 | -1/+11 |
| | | * | | merge from mysql-5.1 to mysql-5.5 | Sujatha Sivakumar | 2013-03-18 | 1 | -15/+31 |
| | | |\ \ | |||||
| | | | * | | Bug#14771299 OUT-OF-BOUND READS WRITE IN MYSQLBINLOG | Sujatha Sivakumar | 2013-03-18 | 1 | -15/+31 |
| | * | | | | MDEV-4297 mysql --binary-mode | Sergei Golubchik | 2013-06-10 | 1 | -4/+2 |
* | | | | | | Merging temporal literals | Alexander Barkov | 2013-07-10 | 1 | -3/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Adding support for the SQL-standard temporal literals. | Alexander Barkov | 2013-07-10 | 1 | -3/+4 |
| |/ / / / / | |||||
* | | | | | | Adding support for MySQL-5.6 temporal column types: | Alexander Barkov | 2013-07-10 | 1 | -0/+2 |
|/ / / / / | |||||
* | | | | | 5.5 merge | Sergei Golubchik | 2013-04-14 | 1 | -71/+96 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.3 merge | Sergei Golubchik | 2013-04-12 | 1 | -71/+96 |
| |\ \ \ \ | |||||
| | * \ \ \ | 5.2 merge | Sergei Golubchik | 2013-04-11 | 1 | -71/+96 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | 5.1 merge | Sergei Golubchik | 2013-04-11 | 1 | -64/+89 |
| | | |\ \ \ \ | |||||
| | | | * | | | | MDEV-4244 [PATCH] Buffer overruns and use-after-free errors | Sergei Golubchik | 2013-04-06 | 1 | -64/+89 |
| | * | | | | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 1 | -5/+14 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -5/+14 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 1 | -5/+14 |
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | |||||
| | | * | | | | | Merge into latest 5.2. | unknown | 2012-08-24 | 1 | -1/+1 |
| | | |\ \ \ \ \ | |||||
| | * | \ \ \ \ \ | Merge into latest 5.3 | unknown | 2012-08-24 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -4/+34 |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -4/+34 |
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | |||||
| | | | * | | | | | | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -4/+34 |
| | | | |\ \ \ \ \ \ | |||||
* | | | | \ \ \ \ \ \ | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | BUG#15891524: RLI_FAKE MODE IS NOT UNSET AFTER BINLOG REPLAY | Nuno Carvalho | 2012-11-20 | 1 | -0/+4 |
* | | | | | | | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -2/+2 |
* | | | | | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -3/+3 |
* | | | | | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -5/+15 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -5/+15 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | upmerge from mysql-5.1=>mysql-5.5 | Rohit Kalhans | 2012-08-08 | 1 | -1/+12 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | * | | | | | | | BUG#11757312: MYSQLBINLOG DOES NOT ACCEPT INPUT FROM STDIN | Rohit Kalhans | 2012-08-08 | 1 | -1/+12 |
| | * | | | | | | | | Merge of patch for Bug#13928675 from mysql-5.1. | Nirbhay Choubey | 2012-08-07 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST | Nirbhay Choubey | 2012-08-07 | 1 | -1/+1 |
| | | | |_|_|/ / / | | | |/| | | | | | |||||
* | | | | | | | | | MDEV-225: Replace with dummy events an event that is not understood by a slav... | unknown | 2012-06-22 | 1 | -0/+13 |
* | | | | | | | | | Automatic merge with 5.5 | Michael Widenius | 2012-09-01 | 1 | -6/+34 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge from 5.3 | unknown | 2012-08-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | merge from 5.2 | unknown | 2012-08-24 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | Merge from 5.1. | unknown | 2012-08-24 | 1 | -1/+1 |
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | / | | | | | |_|/ | | | | |/| | |