diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-08-05 00:02:46 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-08-05 00:02:46 +0200 |
commit | 1610c4285aa2a3421cca9983360ff33e86936479 (patch) | |
tree | 9b37ec3191f3c151bb3010cefb5c0104a6e3e16d /sql/winservice.h | |
parent | 0785b2d55d97207a00b2fb406f8da4aa4bfc9edf (diff) | |
parent | 006ffca56e0638f14152f4ba97ecfc7bfe08d773 (diff) | |
download | mariadb-git-1610c4285aa2a3421cca9983360ff33e86936479.tar.gz |
Merge branch 'bb-10.0-jan' into 10.0
5.5 with our InnoDB changes
Diffstat (limited to 'sql/winservice.h')
0 files changed, 0 insertions, 0 deletions