diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-11-14 16:32:03 +0200 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-11-14 16:32:03 +0200 |
| commit | 94078aa9283a1db1e6fe612169c5e650aa1733c6 (patch) | |
| tree | 370a898ba665a98fe82dbd6ab8d039f5e4199e2e /sql/table.cc | |
| parent | 4f6c7eece38d8ff0443df88fb4197bdf61757740 (diff) | |
| parent | b3a71e34487b69846553111448fa2b32c86176a9 (diff) | |
| download | mariadb-git-94078aa9283a1db1e6fe612169c5e650aa1733c6.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
include/my_sys.h:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
storage/myisam/ft_boolean_search.c:
Auto merged
storage/myisam/ft_parser.c:
Auto merged
storage/myisam/mi_check.c:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index a6e4b4e4f75..6e954072620 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1611,6 +1611,9 @@ 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; @@ -1785,7 +1788,8 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias, outparam, is_create_table, share->default_part_db_type, &work_part_info_used); - outparam->part_info->is_auto_partitioned= share->auto_partitioned; + if (!tmp) + outparam->part_info->is_auto_partitioned= share->auto_partitioned; DBUG_PRINT("info", ("autopartitioned: %u", share->auto_partitioned)); /* we should perform the fix_partition_func in either local or caller's arena depending on work_part_info_used value |