diff options
| author | unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-05-12 15:44:15 -0400 |
|---|---|---|
| committer | unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-05-12 15:44:15 -0400 |
| commit | f7190a3e812607aa0d1f9dfb99da1e975210aa25 (patch) | |
| tree | 26ccf1608efa802339b0aa7bd24f7ac0b722dfdb /sql/sql_partition.cc | |
| parent | b48f2e6122f52409eb3c7257b5fb858dc7babc77 (diff) | |
| parent | 0edd2ec4a74f9df87e972e8d85095394966f05c4 (diff) | |
| download | mariadb-git-f7190a3e812607aa0d1f9dfb99da1e975210aa25.tar.gz | |
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
mysql-test/t/partition.test:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/ndb_partition_key.result:
manual merge
mysql-test/r/partition.result:
manual merge
mysql-test/t/ndb_partition_key.test:
manual merge
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index b3101a1e796..e946e972968 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4518,7 +4518,7 @@ the generated partition syntax in a correct manner. if (alter_info->flags & ALTER_REMOVE_PARTITIONING) { DBUG_PRINT("info", ("Remove partitioning")); - if (!(thd->lex->create_info.used_fields & HA_CREATE_USED_ENGINE)) + if (!(create_info->used_fields & HA_CREATE_USED_ENGINE)) { DBUG_PRINT("info", ("No explicit engine used")); create_info->db_type= table->part_info->default_engine_type; @@ -4535,7 +4535,7 @@ the generated partition syntax in a correct manner. beneath. */ thd->work_part_info= table->part_info; - if (thd->lex->create_info.used_fields & HA_CREATE_USED_ENGINE && + if (create_info->used_fields & HA_CREATE_USED_ENGINE && create_info->db_type != table->part_info->default_engine_type) { /* |