diff options
author | unknown <holyfoot/hf@deer.(none)> | 2007-01-10 16:23:54 +0400 |
---|---|---|
committer | unknown <holyfoot/hf@deer.(none)> | 2007-01-10 16:23:54 +0400 |
commit | cc13bfc6b713cdf4ce645b62dc05046041cc39dd (patch) | |
tree | 383e8442e194f37f989c14b1280fc9e50233f1d9 /sql/sql_partition.cc | |
parent | f70b702092605775b6f75a8ebd04d97e4ad6c090 (diff) | |
parent | c6ac9185bc24f774c8c0730162f54dc6f056e432 (diff) | |
download | mariadb-git-cc13bfc6b713cdf4ce645b62dc05046041cc39dd.tar.gz |
Merge mysql.com:/home/hf/work/24502/my51-24502
into mysql.com:/home/hf/work/mysql-5.1-mrg
sql/sql_partition.cc:
Auto merged
Diffstat (limited to 'sql/sql_partition.cc')
-rw-r--r-- | sql/sql_partition.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 520ad7e8cf9..0b6d841a337 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4738,6 +4738,7 @@ state of p1. } alt_part_info->part_type= tab_part_info->part_type; alt_part_info->subpart_type= tab_part_info->subpart_type; + alt_part_info->no_subparts= tab_part_info->no_subparts; DBUG_ASSERT(!alt_part_info->use_default_partitions); if (alt_part_info->set_up_defaults_for_partitioning(table->file, ULL(0), |