diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-12-04 19:04:25 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-12-04 19:04:25 -0800 |
| commit | f8bfb65b132dae3472d3f4f88995e4cad7f72ebf (patch) | |
| tree | 618476ff0f99a8a0e949d7ba1bbd1699ec2374d2 /sql/sql_base.h | |
| parent | e42024cd0aab425822ae9bf001fb57984e2ef12c (diff) | |
| parent | 5e345281e3599c793fdea771d0f23eb19f22d601 (diff) | |
| download | mariadb-git-f8bfb65b132dae3472d3f4f88995e4cad7f72ebf.tar.gz | |
Merge 5.5->mwl248
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 698c4a012e7..71b4a9289ce 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -306,7 +306,8 @@ TABLE *find_table_for_mdl_upgrade(THD *thd, const char *db, bool no_error); void mark_tmp_table_for_reuse(TABLE *table); bool check_if_table_exists(THD *thd, TABLE_LIST *table, bool *exists); -int update_virtual_fields(THD *thd, TABLE *table, bool ignore_stored= FALSE); +int update_virtual_fields(THD *thd, TABLE *table, + enum enum_vcol_update_mode vcol_update_mode= VCOL_UPDATE_FOR_READ); int dynamic_column_error_message(enum_dyncol_func_result rc); /* open_and_lock_tables with optional derived handling */ |