diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-28 20:19:32 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-28 20:19:32 +0200 |
| commit | e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff (patch) | |
| tree | c6f2f7343bf9ad5dfd40ec83d5485ec3e05d26d2 /include/mysql | |
| parent | b82c602db588cfa688278ef772050c004590c124 (diff) | |
| parent | 49552cf1f7adb3f3b7bb53696cc178363e4d9cb2 (diff) | |
| download | mariadb-git-e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff.tar.gz | |
Merge branch '10.0' 10.1
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/psi/mysql_file.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h index 2f388c285bf..be9d7116b9b 100644 --- a/include/mysql/psi/mysql_file.h +++ b/include/mysql/psi/mysql_file.h @@ -1423,4 +1423,3 @@ inline_mysql_file_sync( /** @} (end of group File_instrumentation) */ #endif - |