database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-24 14:48:09 +03:00
Code Activity

Merge dator5.(none):/home/pappa/clean-mysql-5.1

Browse Source 
into  dator5.(none):/home/pappa/bug18198


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2006-07-21 10:36:26 -04:00
parent 3e2dfa9705 670b65739b
commit 503aa33e18
15 changed files with 244 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_table.cc
View File

@@ -3183,7 +3183,8 @@ bool mysql_create_table_internal(THD *thd,
}
DBUG_PRINT("info", ("db_type = %d",
ha_legacy_type(part_info->default_engine_type)));
if (part_info->check_partition_info(thd, &engine_type, file, create_info))
if (part_info->check_partition_info(thd, &engine_type, file,
create_info, TRUE))
goto err;
part_info->default_engine_type= engine_type;