Commit 7e0f591f authored by Olivier Bertrand's avatar Olivier Bertrand

- Do not accept creating XML2 tables when libxml2 is not available

modified:
  storage/connect/ha_connect.cc
parent d12e1c92
...@@ -2205,12 +2205,12 @@ int ha_connect::write_row(uchar *buf) ...@@ -2205,12 +2205,12 @@ int ha_connect::write_row(uchar *buf)
DBUG_RETURN(0); DBUG_RETURN(0);
#if 0 // AUTO_INCREMENT NIY #if 0 // AUTO_INCREMENT NIY
if (table->next_number_field && buf == table->record[0]) { if (table->next_number_field && buf == table->record[0]) {
int error; int error;
if ((error= update_auto_increment())) if ((error= update_auto_increment()))
return error; return error;
} // endif nex_number_field } // endif nex_number_field
#endif // 0 #endif // 0
...@@ -4032,9 +4032,11 @@ int ha_connect::create(const char *name, TABLE *table_arg, ...@@ -4032,9 +4032,11 @@ int ha_connect::create(const char *name, TABLE *table_arg,
} // endif Libxml2 } // endif Libxml2
#endif // !LIBXML2_SUPPORT #endif // !LIBXML2_SUPPORT
if (!xsup) if (!xsup) {
push_warning(table_arg->in_use, my_message(ER_UNKNOWN_ERROR, g->Message, MYF(0));
MYSQL_ERROR::WARN_LEVEL_WARN, 0, g->Message); rc= HA_ERR_INTERNAL_ERROR;
DBUG_RETURN(rc);
} // endif xsup
} // endif type } // endif type
......
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