diff options
| author | unknown <serg@janus.mylan> | 2007-07-05 10:35:56 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-07-05 10:35:56 +0200 |
| commit | 23d10db8a3fd1830afbca1e0ab374799cc715aaa (patch) | |
| tree | 648a0390c5e88bb9b374f8c3da095fc1fc20d1a4 /sql/sql_table.cc | |
| parent | fcdc76c28952608524d6e5a388bc7b04ad8de09f (diff) | |
| parent | 3a1c7c914ca08b43094f3eba257798750c77e714 (diff) | |
| download | mariadb-git-23d10db8a3fd1830afbca1e0ab374799cc715aaa.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into janus.mylan:/usr/home/serg/Abk/mysql-maria
storage/maria/ma_locking.c:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 0697fdd79b4..a037fc6f727 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -5653,6 +5653,8 @@ view_err: create_info->default_table_charset= table->s->table_charset; if (!(used_fields & HA_CREATE_USED_KEY_BLOCK_SIZE)) create_info->key_block_size= table->s->key_block_size; + if (!(used_fields & HA_CREATE_USED_TRANSACTIONAL)) + create_info->transactional= table->s->transactional; if (!create_info->tablespace && create_info->storage_media != HA_SM_MEMORY) { @@ -6916,7 +6918,6 @@ bool mysql_recreate_table(THD *thd, TABLE_LIST *table_list, lex->col_list.empty(); lex->alter_info.reset(); bzero((char*) &create_info,sizeof(create_info)); - create_info.db_type= 0; create_info.row_type=ROW_TYPE_NOT_USED; create_info.default_table_charset=default_charset_info; /* Force alter table to recreate table */ |