diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-05 10:48:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-05 10:48:03 +0200 |
| commit | 4e7b382d3132e6be0e597d19d6467a9f58b459a7 (patch) | |
| tree | d4b3816306cfb922de1e593386ecbf38492922ed /sql/sql_base.h | |
| parent | 348ccb6f038a6c108ab9b6a01bdc356cefecd3d4 (diff) | |
| parent | 758af98ff7c47cc1fb5debdc138312fa389d528f (diff) | |
| download | mariadb-git-4e7b382d3132e6be0e597d19d6467a9f58b459a7.tar.gz | |
Merge 10.1 to 10.2
Most conflicts are related to the MDEV-11638 InnoDB shutdown refactoring.
Diffstat (limited to 'sql/sql_base.h')
0 files changed, 0 insertions, 0 deletions