diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
| commit | 3b0c7ac1f9d64afc933ce0354037c709366b7dff (patch) | |
| tree | 39cefed54f79f93f82e9c33a4e094270103bf137 /sql/my_apc.cc | |
| parent | e7cf898d6dc3dcac41f58db4761df3a6d1dffc03 (diff) | |
| parent | 22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff) | |
| download | mariadb-git-3b0c7ac1f9d64afc933ce0354037c709366b7dff.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/my_apc.cc')
| -rw-r--r-- | sql/my_apc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/my_apc.cc b/sql/my_apc.cc index 91f5cd3f39c..dcb8503b880 100644 --- a/sql/my_apc.cc +++ b/sql/my_apc.cc @@ -119,7 +119,7 @@ void init_show_explain_psi_keys(void) @retval FALSE - Ok, the call has been made @retval TRUE - Call wasnt made (either the target is in disabled state or - timeout occured) + timeout occurred) */ bool Apc_target::make_apc_call(THD *caller_thd, Apc_call *call, |