Commit 33b2c6fe authored by Olivier Bertrand's avatar Olivier Bertrand

Fixed a bug in ha_connect::GetListOption causing a crash

when passed a NULL oplist argument.

Modified:
ha_connect.cc
parent f83588a0
...@@ -648,7 +648,7 @@ char *ha_connect::GetListOption(const char *opname, ...@@ -648,7 +648,7 @@ char *ha_connect::GetListOption(const char *opname,
char *opval= (char *) def; char *opval= (char *) def;
int n; int n;
for (pk= (char*)oplist; ; pk= ++pn) { for (pk= (char*)oplist; pk; pk= ++pn) {
pn= strchr(pk, ','); pn= strchr(pk, ',');
pv= strchr(pk, '='); pv= strchr(pk, '=');
...@@ -3782,7 +3782,7 @@ bool ha_connect::check_if_incompatible_data(HA_CREATE_INFO *info, ...@@ -3782,7 +3782,7 @@ bool ha_connect::check_if_incompatible_data(HA_CREATE_INFO *info,
// TO DO: implement it. // TO DO: implement it.
if (table) if (table)
push_warning(table->in_use, MYSQL_ERROR::WARN_LEVEL_WARN, 0, push_warning(table->in_use, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
"No check done for compatible changes, you are on your own!"); "The current version of CONNECT did not check what you changed in ALTER. Use on your own risk");
DBUG_RETURN(COMPATIBLE_DATA_YES); DBUG_RETURN(COMPATIBLE_DATA_YES);
} }
......
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