diff options
| author | Monty <monty@mariadb.org> | 2018-01-24 20:37:36 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-24 20:37:36 +0200 |
| commit | 071f52839937bada46c53af23eb220e993c1e12d (patch) | |
| tree | e53bb64e972065ba16f0374ff63cdc93922fe321 /sql/create_options.cc | |
| parent | 62740e02c8805da3bc0e04cef6933635d339dc91 (diff) | |
| parent | 0dbe3dbe7929c209614ab5803084c101b433299c (diff) | |
| download | mariadb-git-071f52839937bada46c53af23eb220e993c1e12d.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
mysql-test/r/sp.result
mysql-test/t/sp.test
Diffstat (limited to 'sql/create_options.cc')
0 files changed, 0 insertions, 0 deletions