diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-08-01 11:39:10 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-08-01 11:39:10 +0300 |
| commit | 60c9485a8e5ebf410d9fa60caa7937f3fe3ca9b8 (patch) | |
| tree | c40fb24f5afc0481c8637dbd0a9a673567118651 /storage/connect/user_connect.h | |
| parent | 31f4df450502d96854c052ce3cd2858ce9dbf900 (diff) | |
| download | mariadb-git-60c9485a8e5ebf410d9fa60caa7937f3fe3ca9b8.tar.gz | |
Merge connect/10.0 into 10.0
Squash all connect/10.0's commits into one and keep only
changes from storage/connect directory.
Diffstat (limited to 'storage/connect/user_connect.h')
| -rw-r--r-- | storage/connect/user_connect.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/connect/user_connect.h b/storage/connect/user_connect.h index a883eb85934..983d9adc478 100644 --- a/storage/connect/user_connect.h +++ b/storage/connect/user_connect.h @@ -1,4 +1,4 @@ -/* Copyright (C) Olivier Bertrand 2004 - 2011 +/* Copyright (C) MariaDB Corporation Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ Declaration of the user_connect class. @note + Author Olivier Bertrand @see /sql/handler.h and /storage/connect/user_connect.cc @@ -53,7 +54,7 @@ public: // Implementation bool user_init(); void SetHandler(ha_connect *hc); - bool CheckCleanup(void); + bool CheckCleanup(bool force = false); bool CheckQueryID(void) {return thdp->query_id > last_query_id;} bool CheckQuery(query_id_t vid) {return last_query_id > vid;} |