Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-06-30 | 1 | -0/+30 |
|\ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-06-28 | 1 | -0/+30 |
| |\ | |||||
| | * | MDEV-13187 incorrect backslash parsing in clients | Sergei Golubchik | 2017-06-27 | 1 | -0/+15 |
| | * | MDEV-13187 incorrect backslash parsing in clients | Sergei Golubchik | 2017-06-27 | 1 | -0/+15 |
* | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 1 | -0/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-10-25 | 1 | -0/+8 |
| |\ \ | | |/ | |||||
| | * | mysql cli: fix USE command quoting | Sergei Golubchik | 2016-10-13 | 1 | -0/+8 |
* | | | MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be s... | Oleksandr Byelkin | 2015-09-04 | 1 | -0/+3 |
* | | | MDEV-6572 "USE dbname" with a bad sequence erroneously connects to a wrong da... | Alexander Barkov | 2015-03-16 | 1 | -0/+24 |
|/ / | |||||
* | | merge 5.5 -> 10.0-base | unknown | 2013-08-20 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | mysql --skip-column-names flag should not affect alignment of field values, | Sergei Golubchik | 2013-08-08 | 1 | -0/+5 |
| * | 5.3 merge. | Sergei Golubchik | 2013-05-20 | 1 | -1/+1 |
| |\ | |||||
| | * | 5.2 merge | Sergei Golubchik | 2013-05-20 | 1 | -1/+1 |
| | |\ | |||||
| | | * | MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ma_blockre... | Michael Widenius | 2013-05-11 | 1 | -1/+1 |
* | | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -0/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -0/+9 |
| |\ \ \ | |||||
* | \ \ \ | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -0/+12 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -0/+12 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | 5.2->5.3 merge | Sergei Golubchik | 2013-01-10 | 1 | -0/+12 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | mysql-5.1.67 merge | Sergei Golubchik | 2013-01-09 | 1 | -0/+12 |
| | | |\ \ | |||||
* | | | | | | Fixed build failures found by buildbot | Michael Widenius | 2012-06-05 | 1 | -6/+6 |
|/ / / / / | |||||
* | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+8 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys... | Michael Widenius | 2011-10-26 | 1 | -1/+1 |
| * | | | | Added MariaDB executable comment syntax: /*M!##### */ | Michael Widenius | 2011-08-29 | 1 | -0/+7 |
| |/ / / | |||||
| * | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+143 |
| |\ \ \ | |||||
* | \ \ \ | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -0/+149 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Auto-merge from mysql-5.1 for bug#57450. | Dmitry Shulga | 2011-02-05 | 1 | -0/+6 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Fixed bug#57450 - mysql client enter in an infinite loop | Dmitry Shulga | 2011-02-05 | 1 | -0/+6 |
| | | |/ | | |/| | |||||
| * | | | Merging from mysql-5.1-bugteam | Nirbhay Choubey | 2010-12-01 | 1 | -15/+14 |
| |\ \ \ | | |/ / | |||||
| | * | | Additional fix for bug#54899 | Nirbhay Choubey | 2010-12-01 | 1 | -15/+14 |
| * | | | Merging from mysql-5.1-bugteam | Alexander Barkov | 2010-11-26 | 1 | -0/+144 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug #54899 : --one-database option cannot handle DROP/CREATE DATABASE commands | Nirbhay Choubey | 2010-11-26 | 1 | -0/+144 |
* | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -0/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+6 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -4/+10 |
| |\ \ \ | |||||
| * | | | | MBug#443092: test cases mysql and mysql_upgrade fails with wildcard DNS | unknown | 2009-10-05 | 1 | -0/+1 |
* | | | | | mysql.test fixed. | Alexey Botchkov | 2010-08-25 | 1 | -6/+0 |
* | | | | | Bug#54466 client 5.5 built from source lacks "pager" support | Alexey Botchkov | 2010-08-19 | 1 | -0/+6 |
| |_|_|/ |/| | | | |||||
* | | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-24 | 1 | -1/+6 |
|\ \ \ \ | |||||
| * \ \ \ | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-23 | 1 | -1/+6 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge approved bug fix | Jim Winstead | 2009-12-17 | 1 | -1/+6 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | The mysql command line client ignored the --skip-column-names option | Jim Winstead | 2009-09-21 | 1 | -0/+5 |
| | | |/ | |||||
* | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -4/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -0/+5 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | merge | Georgi Kodinov | 2009-11-27 | 1 | -3/+6 |
| |\ \ \ | |||||
| | * | | | added the missing remove of the temp file | Georgi Kodinov | 2009-11-27 | 1 | -0/+1 |
| * | | | | merge | Georgi Kodinov | 2009-11-27 | 1 | -1/+4 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
| | * | | Addendum to Bug #27884: fixed test incompatibility on windows. | Georgi Kodinov | 2009-11-27 | 1 | -1/+4 |
| | * | | Backport fix for Bug #27884. | Jim Winstead | 2009-11-23 | 1 | -0/+6 |