diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-14 10:26:18 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-14 13:33:01 +0400 |
| commit | e86010f909fb6b8c4ffd9d6df92991ac079e67e7 (patch) | |
| tree | e30f0335d75b480ffe1f546c4b0f86b530c4558c /storage/oqgraph | |
| parent | fa21952e25e3defef172e1f2074e3e2d5b091f5c (diff) | |
| download | mariadb-git-e86010f909fb6b8c4ffd9d6df92991ac079e67e7.tar.gz | |
MDEV-20342 Turn Field::flags from a member to a method
Diffstat (limited to 'storage/oqgraph')
| -rw-r--r-- | storage/oqgraph/ha_oqgraph.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/oqgraph/ha_oqgraph.cc b/storage/oqgraph/ha_oqgraph.cc index 20ebd49bd5d..f2a91b51663 100644 --- a/storage/oqgraph/ha_oqgraph.cc +++ b/storage/oqgraph/ha_oqgraph.cc @@ -335,13 +335,13 @@ int ha_oqgraph::oqgraph_check_table_structure (TABLE *table_arg) if (!badColumn) if (skel[i].coltype != MYSQL_TYPE_DOUBLE && (!isLatchColumn || !isStringLatch)) { /* Check Is UNSIGNED */ - if ( (!((*field)->flags & UNSIGNED_FLAG ))) { + if (!(*field)->is_unsigned()) { badColumn = true; push_warning_printf( current_thd, Sql_condition::WARN_LEVEL_WARN, HA_WRONG_CREATE_OPTION, "Column %d must be UNSIGNED.", i); } } /* Check THAT NOT NULL isn't set */ - if (!badColumn) if ((*field)->flags & NOT_NULL_FLAG) { + if (!badColumn) if ((*field)->flags() & NOT_NULL_FLAG) { badColumn = true; push_warning_printf( current_thd, Sql_condition::WARN_LEVEL_WARN, HA_WRONG_CREATE_OPTION, "Column %d must be NULL.", i); } @@ -658,7 +658,7 @@ int ha_oqgraph::open(const char *name, int mode, uint test_if_locked) if (strcmp(options->origid, (*field)->field_name.str)) continue; if ((*field)->cmp_type() != INT_RESULT || - !((*field)->flags & NOT_NULL_FLAG)) + !((*field)->flags() & NOT_NULL_FLAG)) { fprint_error("Column '%s.%s' (origid) is not a not-null integer type", options->table_name, options->origid); @@ -683,7 +683,7 @@ int ha_oqgraph::open(const char *name, int mode, uint test_if_locked) if (strcmp(options->destid, (*field)->field_name.str)) continue; if ((*field)->type() != origid->type() || - !((*field)->flags & NOT_NULL_FLAG)) + !((*field)->flags() & NOT_NULL_FLAG)) { fprint_error("Column '%s.%s' (destid) is not a not-null integer type or is a different type to origid attribute.", options->table_name, options->destid); @@ -715,7 +715,7 @@ int ha_oqgraph::open(const char *name, int mode, uint test_if_locked) if (strcmp(options->weight, (*field)->field_name.str)) continue; if ((*field)->result_type() != REAL_RESULT || - !((*field)->flags & NOT_NULL_FLAG)) + !((*field)->flags() & NOT_NULL_FLAG)) { fprint_error("Column '%s.%s' (weight) is not a not-null real type", options->table_name, options->weight); |