diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-15 15:56:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-16 10:24:53 +0200 |
| commit | 105f46ffb801bc1487c0383f73729fefa568f017 (patch) | |
| tree | 38e5f8349c3d2d066887c17438aec6469dc2b85b /storage/innobase/pars/pars0pars.cc | |
| parent | aad15eae89e9700d4c1ed4c83a68f8c7b6775a27 (diff) | |
| download | mariadb-git-105f46ffb801bc1487c0383f73729fefa568f017.tar.gz | |
MDEV-12273 Remove dict_table_t::does_not_fit_in_memory
In the InnoDB internal SQL parser, there is the keyword
DOES_NOT_FIT_IN_MEMORY that is never specified in any CREATE TABLE
statement that is passed to the InnoDB SQL parser
(que_eval_sql() or pars_sql() or yyparse()). If this keyword were
ever present, it would set the flag dict_table_t::does_not_fit_in_memory
which is only present in debug builds.
Let us remove all traces of this.
Also, fix storage/innobase/pars/make_flex.sh so that no the generated
file storage/innobase/pars/lexyy.cc works as is.
FIXME: Always generate the InnoDB Bison files at build time, similar
to how sql/sql_yacc.yy is handled. (This would still leave the
generated scanner files, unless we want to add a build-time dependency
for Flex.)
Diffstat (limited to 'storage/innobase/pars/pars0pars.cc')
| -rw-r--r-- | storage/innobase/pars/pars0pars.cc | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc index 36846e418b0..f34784b2883 100644 --- a/storage/innobase/pars/pars0pars.cc +++ b/storage/innobase/pars/pars0pars.cc @@ -1857,18 +1857,7 @@ pars_create_table( table */ sym_node_t* column_defs, /*!< in: list of column names */ sym_node_t* compact, /* in: non-NULL if COMPACT table. */ - sym_node_t* block_size, /* in: block size (can be NULL) */ - void* not_fit_in_memory MY_ATTRIBUTE((unused))) - /*!< in: a non-NULL pointer means that - this is a table which in simulations - should be simulated as not fitting - in memory; thread is put to sleep - to simulate disk accesses; NOTE that - this flag is not stored to the data - dictionary on disk, and the database - will forget about non-NULL value if - it has to reload the table definition - from disk */ + sym_node_t* block_size) /* in: block size (can be NULL) */ { dict_table_t* table; sym_node_t* column; @@ -1932,11 +1921,6 @@ pars_create_table( table = dict_mem_table_create( table_sym->name, 0, n_cols, 0, flags, flags2); -#ifdef UNIV_DEBUG - if (not_fit_in_memory != NULL) { - table->does_not_fit_in_memory = TRUE; - } -#endif /* UNIV_DEBUG */ column = column_defs; while (column) { |