diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-08 19:44:22 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-09 08:53:08 +0200 |
| commit | ad0c218a440575fa6fb6634aca7a08448a4360e0 (patch) | |
| tree | b52811847ce51c92eabdeed3104df8b0168943df /storage/connect/tabzip.h | |
| parent | bb4ef470c24cdbcedba3dd3dcda3b3d88b6fb491 (diff) | |
| parent | 9fe92a9770a801c4cd36390620486be4cb06752b (diff) | |
| download | mariadb-git-ad0c218a440575fa6fb6634aca7a08448a4360e0.tar.gz | |
Merge 10.0 into 10.1
Also, implement MDEV-11027 a little differently from 5.5 and 10.0:
recv_apply_hashed_log_recs(): Change the return type back to void
(DB_SUCCESS was always returned).
Report progress also via systemd using sd_notifyf().
Diffstat (limited to 'storage/connect/tabzip.h')
| -rw-r--r-- | storage/connect/tabzip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/tabzip.h b/storage/connect/tabzip.h index 6f1735258e7..dcec3475371 100644 --- a/storage/connect/tabzip.h +++ b/storage/connect/tabzip.h @@ -20,7 +20,7 @@ typedef class ZIPCOL *PZIPCOL; /***********************************************************************/ class DllExport ZIPDEF : public DOSDEF { /* Table description */ friend class TDBZIP; - friend class ZIPFAM; + friend class UNZFAM; public: // Constructor ZIPDEF(void) {} |