diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-03 13:02:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-03 13:02:56 +0300 |
| commit | 814ae57daf3ba7ac7f8c7892fbd54a6142a70f44 (patch) | |
| tree | 24a647cfd585c6ba42a185002fe9394ab74d4bd4 /sql/handler.h | |
| parent | 976f92051417a99369f5bb45d9f18c87655a9f85 (diff) | |
| parent | 9d42eb5e28303adb4d9467ac3e9c3be35d46e643 (diff) | |
| download | mariadb-git-814ae57daf3ba7ac7f8c7892fbd54a6142a70f44.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h index dad2b30dec0..ed2ef822c88 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 @@ -598,7 +598,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() { |