diff options
author | unknown <pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-03-20 14:41:50 -0500 |
---|---|---|
committer | unknown <pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-03-20 14:41:50 -0500 |
commit | a5b8b7755ececaa340ba78ab4ac06058526bdb9d (patch) | |
tree | 7c6033924ed6ff3437dd77cdfa0331fc6b3f64f3 /sql/sql_table.cc | |
parent | f9dd31ca8ec96c2c315a9f8011d4f1ed5b73b0a4 (diff) | |
parent | 51f70d9ff7b38d68d5fca9f7eb155b6f41a4d98f (diff) | |
download | mariadb-git-a5b8b7755ececaa340ba78ab4ac06058526bdb9d.tar.gz |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/ndb_partition_key.result:
manual merge
mysql-test/t/ndb_partition_key.test:
manual merge
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r-- | sql/sql_table.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 54fcefa3e6d..0e404e263ca 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2053,6 +2053,7 @@ bool mysql_create_table_internal(THD *thd, DBUG_RETURN(TRUE); } file->set_auto_partitions(part_info); + part_info->default_engine_type= create_info->db_type; } if (part_info) { |