summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-04-30 22:04:35 +0200
committerSergei Golubchik <sergii@pisem.net>2010-04-30 22:04:35 +0200
commit2b8de050bfc98f0a0774d6a54be05ee774d2fa46 (patch)
treea3249b77467f82fa1c8bf1119f561a3952be141e /sql/unireg.cc
parentb58cb7c4a283ea9775d55d1d133cec9359f86dfa (diff)
downloadmariadb-git-2b8de050bfc98f0a0774d6a54be05ee774d2fa46.tar.gz
create table options bug:
alter table does not reset HA_OPTION_TEXT_CREATE_OPTIONS when the last option value is removed
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r--sql/unireg.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 3a153277337..a048adbef72 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -197,6 +197,8 @@ bool mysql_create_frm(THD *thd, const char *file_name,
create_info->table_options|= HA_OPTION_TEXT_CREATE_OPTIONS;
create_info->extra_size+= (options_len + 4);
}
+ else
+ create_info->table_options&= ~HA_OPTION_TEXT_CREATE_OPTIONS;
if ((file=create_frm(thd, file_name, db, table, reclength, fileinfo,
create_info, keys)) < 0)