diff options
| -rw-r--r-- | client/mysql.cc | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index cef31b46b2c..009661e821f 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1029,7 +1029,7 @@ static bool add_line(String &buffer,char *line,char *in_string, inchar == '-' && pos[1] == '-' && my_isspace(system_charset_info,pos[2])))) break; // comment to end of line - else if (!*in_string && inchar == '/' && *(pos+1) == '*') + else if (!*in_string && inchar == '/' && *(pos+1) == '*' && *(pos+2) != '!') { pos++; *ml_comment= 1; diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index bb40d757166..e4966a392ba 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1173,7 +1173,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, if (INTERNAL_NUM_FIELD(field)) field->flags|= NUM_FLAG; if (default_value && row->data[6]) - field->def=strdup_root(alloc,(char*) row->data[8]); + field->def=strdup_root(alloc,(char*) row->data[6]); else field->def=0; field->max_length= 0; |