diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-03 15:57:23 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-03 15:57:23 +0300 |
| commit | 05459706f22b1d9d22abd24e6de3b505d787beb3 (patch) | |
| tree | 3e850e0cbf5489fbf36f5c1579248e344bfe2395 /sql/handler.h | |
| parent | 8ae2a2dbe6fc52d40ec88c325b9a44de52f83f2f (diff) | |
| parent | e6a808bec790fdbbf1dc0a6b03fb6c8b6e41dc01 (diff) | |
| download | mariadb-git-05459706f22b1d9d22abd24e6de3b505d787beb3.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/handler.h b/sql/handler.h index ce8711bd5ab..c6d7ef5870a 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -2,7 +2,7 @@ #define HANDLER_INCLUDED /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, MariaDB Corporation. + Copyright (c) 2009, 2018, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -818,7 +818,7 @@ struct xid_t { bqual_length= b; memcpy(data, d, g+b); } - bool is_null() { return formatID == -1; } + bool is_null() const { return formatID == -1; } void null() { formatID= -1; } my_xid quick_get_my_xid() { @@ -4829,5 +4829,5 @@ void print_keydup_error(TABLE *table, KEY *key, const char *msg, myf errflag); void print_keydup_error(TABLE *table, KEY *key, myf errflag); int del_global_index_stat(THD *thd, TABLE* table, KEY* key_info); -int del_global_table_stat(THD *thd, LEX_CSTRING *db, LEX_CSTRING *table); +int del_global_table_stat(THD *thd, const LEX_CSTRING *db, const LEX_CSTRING *table); #endif /* HANDLER_INCLUDED */ |