Commit 54d4589d authored by Olivier Bertrand's avatar Olivier Bertrand

- Previous MDEV-5261 was generating wrong warnings

modified:
  storage/connect/ha_connect.cc
parent a8b09c14
......@@ -4600,9 +4600,9 @@ int ha_connect::create(const char *name, TABLE *table_arg,
} // endfor field
if (IsFileType(type)) {
table= table_arg; // Used by called functions
if (IsFileType(type)) {
if (!options->filename) {
// The file name is not specified, create a default file in
// the database directory named table_name.table_type.
......@@ -4666,6 +4666,8 @@ int ha_connect::create(const char *name, TABLE *table_arg,
} // endif filename
} // endif type
// To check whether indexes have to be made or remade
if (!g->Xchk) {
PIXDEF xdp;
......@@ -4704,7 +4706,8 @@ int ha_connect::create(const char *name, TABLE *table_arg,
} else {
PIXDEF xdp= GetIndexInfo();
if (xdp && !IsTypeIndexable(type)) {
if (xdp) {
if (!IsTypeIndexable(type)) {
g->Xchk= NULL;
sprintf(g->Message, "Table type %s is not indexable", options->type);
my_message(ER_UNKNOWN_ERROR, g->Message, MYF(0));
......@@ -4714,11 +4717,12 @@ int ha_connect::create(const char *name, TABLE *table_arg,
((PCHK)g->Xchk)->newsep= GetBooleanOption("Sepindex", false);
} // endif Indexable
} else if (!((PCHK)g->Xchk)->oldpix)
g->Xchk= NULL;
} // endif Xchk
table= st;
} // endif type
DBUG_RETURN(rc);
} // end of create
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment