diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-20 13:16:03 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-20 14:33:24 +0200 |
| commit | 587568b72a0f4bcb284b292f158dea6f65c03487 (patch) | |
| tree | e9caae1f20e997ce2bc528fc41d1adbe2c2d8bf0 /sql/table.h | |
| parent | bcb36ee21e2515d17dcf03b760487e64eb780f2b (diff) | |
| parent | 51c415d97d60cad732d05c9d5516f7fa3fde1df9 (diff) | |
| download | mariadb-git-587568b72a0f4bcb284b292f158dea6f65c03487.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/table.h b/sql/table.h index 94173ee79e3..73c40992751 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1,7 +1,7 @@ #ifndef TABLE_INCLUDED #define TABLE_INCLUDED -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2009, 2014, SkySQL Ab. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. + 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 as published by @@ -511,10 +511,11 @@ typedef struct st_table_field_def class Table_check_intact { protected: + bool has_keys; virtual void report_error(uint code, const char *fmt, ...)= 0; public: - Table_check_intact() {} + Table_check_intact() : has_keys(FALSE) {} virtual ~Table_check_intact() {} /** Checks whether a table is intact. */ |