diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-16 11:33:54 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-16 11:33:54 +0300 |
| commit | 13348d3769735c4ed23df263e9c00e42d7a08aca (patch) | |
| tree | 765dbf44bc16c28e3d63a3439bed89b86e4b92fc /sql/table.cc | |
| parent | 58b24720b65ff817f5dd587922eb678a8473895a (diff) | |
| parent | bd1f8f5bfaf9748ca445401687cca97a89e0dfee (diff) | |
| download | mariadb-git-13348d3769735c4ed23df263e9c00e42d7a08aca.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/table.cc b/sql/table.cc index aef836c330e..74add641544 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1640,9 +1640,6 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias, DBUG_PRINT("enter",("name: '%s.%s' form: 0x%lx", share->db.str, share->table_name.str, (long) outparam)); - /* Parsing of partitioning information from .frm needs thd->lex set up. */ - DBUG_ASSERT(thd->lex->is_lex_started); - error= 1; bzero((char*) outparam, sizeof(*outparam)); outparam->in_use= thd; |